Merge remote-tracking branch 'origin/master'

phpmyadmin · Sep 2, 2015 · a2e928d · a2e928d
2 parents f07d4c3 + 4fe8c5f
commit a2e928d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
@@ -1801,11 +1801,11 @@ function PMA_getCurrentAuthenticationPlugin(
         if (isset($row) && $row && ! empty($row['plugin'])) {
             $authentication_plugin = $row['plugin'];
         }
-    } else {
+    } elseif (PMA_MYSQL_INT_VERSION >= 50702) {
         $row = $GLOBALS['dbi']->fetchSingleRow(
             'SELECT @@default_authentication_plugin'
         );
-        $authentication_plugin = $row['Value'];
+        $authentication_plugin = $row['@@default_authentication_plugin'];
     }
 
     return $authentication_plugin;