Order by COUNT (thanks to paranoiq)

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@1000 7c3ca157-0c34-0410-bff1-cbf682f78f5c

diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index a619a8f7d74e6dfffa353c161e03a5ff55a68008..e8082bae697e7f856ec7825937053702944a27e9 100644 (file)
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -301,7 +301,7 @@ class Adminer {
        function selectOrderProcess($fields, $indexes) {
                $return = array();
                foreach ((array) $_GET["order"] as $key => $val) {
-                       if (isset($fields[$val]) || preg_match('~^[A-Z0-9_]+\\(`(?:[^`]|``)+`\\)$~', $val)) {
+                       if (isset($fields[$val]) || preg_match('~^((COUNT\\(DISTINCT |[A-Z0-9_]+\\()`(?:[^`]|``)+`\\)|COUNT\\(\\*\\))$~', $val)) {
                                $return[] = idf_escape($val) . (isset($_GET["desc"][$key]) ? " DESC" : "");
                        }
                }