Merge branch 'QA_4_5'

phpmyadmin · Nov 4, 2015 · 4a0b34b · 4a0b34b
2 parents 26aeef7 + 71f86d2
commit 4a0b34b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -30,6 +30,7 @@ phpMyAdmin - ChangeLog
 - issue #11476 Errors instead of git info when PHP has no gzip support
 - issue #11633 CodeMirror tooltip shows below modal window
 - issue #11639 Bug with the MainBackground Color
+- issue        Profiling checkbox is missing
 
 4.5.1.0 (2015-10-23)
 - issue        Invalid argument supplied for foreach()

diff --git a/libraries/Util.php b/libraries/Util.php
@@ -1407,7 +1407,7 @@ public static function profilingSupported()
             // (avoid a trip to the server for MySQL before 5.0.37)
             // and do not set a constant as we might be switching servers
             if (defined('PMA_MYSQL_INT_VERSION')
-                && $GLOBALS['dbi']->fetchValue("SELECT @@profiling")
+                && $GLOBALS['dbi']->fetchValue("SELECT @@have_profiling")
             ) {
                 self::cacheSet('profiling_supported', true);
             } else {