Merge branch 'master' of github.com:phpmyadmin/phpmyadmin

ossguy · Nov 27, 2013 · ab3fa5e · ab3fa5e
2 parents ca5494c + 20770f3
commit ab3fa5e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -71,6 +71,7 @@ phpMyAdmin - ChangeLog
 - bug #4075 Support A10 Networks load balancer
 - bug #4083 row deleting isn't binlogs friendly
 - bug #4163 Setup script does not recognize manually-configured server
+- bug #4158 Events page says no privileges with ALL PRIVILEGES
 
 4.0.9.0 (2013-11-04)
 - bug #4104 Can't edit updatable view when searching

diff --git a/libraries/Util.class.php b/libraries/Util.class.php
@@ -3850,7 +3850,15 @@ public static function currentUserHasPrivilege($priv, $db = null, $tbl = null)
             // (wildcard characters appear as being quoted with a backslash
             //  when querying TABLE_SCHEMA.SCHEMA_PRIVILEGES)
             $db = str_replace(array('%', '_'), array('\%', '\_'), $db);
-            $query .= " AND TABLE_SCHEMA='%s'";
+            /*
+             * This is to take into account a wildcard db privilege
+             * so we replace % by .* and _ by . to be able to compare
+             * with REGEXP.
+             *
+             * Also, we need to double the inner % to please sprintf().
+             */
+            $query .= " AND '%s' REGEXP"
+                . " REPLACE(REPLACE(TABLE_SCHEMA, '_', '.'), '%%', '.*')";
             $schema_privileges = $GLOBALS['dbi']->fetchValue(
                 sprintf(
                     $query,