[phpMyAdmin] - Upstream released 3.3.5.1 (#625877, #625878) - Added patch to fix wrong variable check at nopasswo

[Robert Scheck]

commit ac8c6000f5a08f6fe221a13712a50d8e94827f67
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Fri Aug 20 22:38:45 2010 +0200

    - Upstream released 3.3.5.1 (#625877, #625878)
    - Added patch to fix wrong variable check at nopassword (#622428)

 .gitignore                    |    2 +-
 phpMyAdmin-3.3.5-mysqli.patch |   16 ++++++++++++++++
 phpMyAdmin.spec               |    8 +++++++-
 sources                       |    2 +-
 4 files changed, 25 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index eba3985..1811d61 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-phpMyAdmin-3.3.5-all-languages.tar.bz2
+phpMyAdmin-3.3.5.1-all-languages.tar.bz2
diff --git a/phpMyAdmin-3.3.5-mysqli.patch b/phpMyAdmin-3.3.5-mysqli.patch
new file mode 100644
index 0000000..7a19f04
--- /dev/null
+++ b/phpMyAdmin-3.3.5-mysqli.patch
@@ -0,0 +1,16 @@
+Patch by Will Palmer for phpMyAdmin >= 3.3.5, which fixes the wrong variable check at the nopassword option. More
+details can be found at: https://sourceforge.net/tracker/?func=detail&aid=3039269&group_id=23067&atid=377410
+
+--- phpMyAdmin-3.3.5-all-languages/libraries/dbi/mysqli.dbi.lib.php		2010-08-20 13:55:27.000000000 +0200
++++ phpMyAdmin-3.3.5-all-languages/libraries/dbi/mysqli.dbi.lib.php.mysqli	2010-08-20 22:25:11.000000000 +0200
+@@ -110,9 +110,8 @@
+     
+     if (!$server) {
+       $return_value = @mysqli_real_connect($link, $GLOBALS['cfg']['Server']['host'], $user, $password, false, $server_port, $server_socket, $client_flags);
+-
+       // Retry with empty password if we're allowed to
+-      if ($return_value == false && isset($cfg['Server']['nopassword']) && $cfg['Server']['nopassword'] && !$is_controluser) {
++      if ($return_value == false && isset($GLOBALS['cfg']['Server']['nopassword']) && $GLOBALS['cfg']['Server']['nopassword'] && !$is_controluser) {
+ 	  $return_value = @mysqli_real_connect($link, $GLOBALS['cfg']['Server']['host'], $user, '', false, $server_port, $server_socket, $client_flags);
+       }
+     } else {
diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec
index 79d3f83..ede38a2 100644
--- a/phpMyAdmin.spec
+++ b/phpMyAdmin.spec
@@ -1,5 +1,5 @@
 Name: phpMyAdmin
-Version: 3.3.5
+Version: 3.3.5.1
 Release: 1%{?dist}
 Summary: Web based MySQL browser written in php
 
@@ -10,6 +10,7 @@ Source0: http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}
 Source1: phpMyAdmin-config.inc.php
 Source2: phpMyAdmin.htaccess
 Patch0: phpMyAdmin-3.3.3-vendor.patch
+Patch1: phpMyAdmin-3.3.5-mysqli.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
@@ -31,6 +32,7 @@ is available in over 55 languages.
 %prep
 %setup -q -n %{name}-%{version}-all-languages
 %patch0 -p1
+%patch1 -p1
 
 # Setup vendor config file
 sed -e "/'CHANGELOG_FILE'/s at ./ChangeLog@%{_datadir}/doc/%{name}-%{version}/ChangeLog@" \
@@ -69,6 +71,10 @@ rm -rf %{buildroot}
 %dir %attr(0755,apache,apache) %{_localstatedir}/lib/%{name}/config
 
 %changelog
+* Fri Aug 20 2010 Robert Scheck <robert at fedoraproject.org> 3.3.5.1-1
+- Upstream released 3.3.5.1 (#625877, #625878)
+- Added patch to fix wrong variable check at nopassword (#622428)
+
 * Tue Jul 27 2010 Robert Scheck <robert at fedoraproject.org> 3.3.5-1
 - Upstream released 3.3.5 (#618586)
 
diff --git a/sources b/sources
index 060de06..25d55e2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6488c3f9c119417c38bbeaa0a4e5a90e  phpMyAdmin-3.3.5-all-languages.tar.bz2
+cf6a1de87b8b590703aaa61aafefc95a  phpMyAdmin-3.3.5.1-all-languages.tar.bz2