Merge branch 'QA_4_7'

phpmyadmin · Jun 6, 2017 · a55d414 · a55d414
2 parents ae67d1c + 8a98c29
commit a55d414
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -21,6 +21,7 @@ phpMyAdmin - ChangeLog
 - issue #13311 Fixed direct login for accounts without password
 - issue #13316 Fixed check for mbstring.func_overload
 - issue #13323 Fixed wrong encoding of table at triggers
+- issue #12976 Fixed natural sorting in several places
 
 4.7.1 (2017-05-25)
 - issue #13132 Always execute tracking queries as controluser

diff --git a/libraries/DatabaseInterface.php b/libraries/DatabaseInterface.php
@@ -327,7 +327,7 @@ public function getTables($database, $link = null)
             self::QUERY_STORE
         );
         if ($GLOBALS['cfg']['NaturalOrder']) {
-            uksort($tables, 'strnatcasecmp');
+            natsort($tables);
         }
         return $tables;
     }

diff --git a/libraries/controllers/table/TableRelationController.php b/libraries/controllers/table/TableRelationController.php
@@ -307,7 +307,7 @@ public function getDropdownValueForTableAction()
             $columns[] = htmlspecialchars($column);
         }
         if ($GLOBALS['cfg']['NaturalOrder']) {
-            uksort($columns, 'strnatcasecmp');
+            natsort($columns);
         }
         $this->response->addJSON('columns', $columns);
 
@@ -360,7 +360,7 @@ public function getDropdownValueForDbAction()
             }
         }
         if ($GLOBALS['cfg']['NaturalOrder']) {
-            uksort($tables, 'strnatcasecmp');
+            natsort($tables);
         }
         $this->response->addJSON('tables', $tables);
     }

diff --git a/templates/table/relation/foreign_key_row.phtml b/templates/table/relation/foreign_key_row.phtml
@@ -69,7 +69,7 @@ if ($foreign_db) {
         }
     }
     if ($GLOBALS['cfg']['NaturalOrder']) {
-        uksort($tables, 'strnatcasecmp');
+        natsort($tables);
     }
 }
 ?>