From 821d040d6c968a70bf38ef5ec124114fab75f8dd Mon Sep 17 00:00:00 2001 From: jakubvrana Date: Mon, 24 Aug 2009 10:51:42 +0000 Subject: [PATCH] Order by COUNT (thanks to paranoiq) git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@1000 7c3ca157-0c34-0410-bff1-cbf682f78f5c --- adminer/include/adminer.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php index a619a8f7..e8082bae 100644 --- 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" : ""); } }