mirror/php-adminer
1
0
Fork 0
mirror of https://github.com/vrana/adminer.git synced 2025-08-17 20:01:25 +02:00
Code Issues Releases Wiki Activity

FOUND_ROWS only with GROUP BY

Browse Source 
Default order only by common indexes in Editor
Descending default order with date in Editor

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@930 7c3ca157-0c34-0410-bff1-cbf682f78f5c
This commit is contained in:
jakubvrana
2009-07-28 14:21:05 +00:00
parent 98b88eb15e
commit 07e1ae10f5
3 changed files with 34 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
adminer/include/adminer.inc.php
View File

@@ -266,7 +266,7 @@ class Adminer {
* @param array
* @return array expressions to join by AND
*/
function selectSearchProcess($indexes, $fields) {
function selectSearchProcess($fields, $indexes) {
global $dbh;
$return = array();
foreach ($indexes as $i => $index) {
@@ -297,14 +297,13 @@ class Adminer {
/** Process order box in select
* @param array
* @param array result of selectColumnsProcess()
* @param array
* @return array expressions to join by comma
*/
function selectOrderProcess($columns, $select, $indexes) {
function selectOrderProcess($fields, $indexes) {
$return = array();
foreach ((array) $_GET["order"] as $key => $val) {
if (isset($columns[$val]) || in_array($val, $select, true)) {
if (isset($fields[$val]) || preg_match('~^[A-Z0-9_]+\\(`(?:[^`]+|``)+`\\)$~', $val)) {
$return[] = idf_escape($val) . (isset($_GET["desc"][$key]) ? " DESC" : "");
}
}