Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0

ChangeLog

@@ -2,6 +2,8 @@ phpMyAdmin - ChangeLog
 ======================
 
 4.0.7.0 (not yet released)
+- bug #3993 Sorting in database overview with statistics doesn't work
+- bug Handle the situation where PHP_SELF is not set 
 
 4.0.6.0 (not yet released)
 - bug #4036 Call to undefined function mb_detect_encoding (clarify the doc)

libraries/Config.class.php

@@ -1271,7 +1271,13 @@ class PMA_Config
 
                 // And finally the path could be already set from REQUEST_URI
                 if (empty($url['path'])) {
-                    $path = parse_url($GLOBALS['PMA_PHP_SELF']);
+                    // we got a case with nginx + php-fpm where PHP_SELF
+                    // was not set, so PMA_PHP_SELF was not set as well 
+                    if (isset($GLOBALS['PMA_PHP_SELF'])) {
+                        $path = parse_url($GLOBALS['PMA_PHP_SELF']);
+                    } else {
+                        $path = parse_url(PMA_getenv('REQUEST_URI'));
+                    }
                     $url['path'] = $path['path'];
                 }
             }

server_databases.php

@@ -184,7 +184,6 @@ if ($databases_count > 0) {
     );
 
     $_url_params['pos'] = $pos;
-    $_url_params['drop_selected_dbs'] = 1;
 
     echo '<form class="ajax" action="server_databases.php" ';
     echo 'method="post" name="dbStatsForm" id="dbStatsForm">' . "\n";