The branch, QA_3_4 has been updated
via 68e21b05e46f144735faa849b80734d83812c7e6 (commit)
via 7909da2ea01b15aad44689c9cc59051d747d0381 (commit)
from e466dec53b4fca185e03d0a66b434f491355c274 (commit)
- Log -----------------------------------------------------------------
commit 68e21b05e46f144735faa849b80734d83812c7e6
Author: Madhura Jayaratne <[email protected]>
Date: Thu Aug 4 00:04:16 2011 +0530
Changelog entry for bug #3383711. Some formatting
commit 7909da2ea01b15aad44689c9cc59051d747d0381
Author: Sven Strickroth <[email protected]>
Date: Mon Aug 1 16:05:36 2011 +0200
quick fix for issue #3383711
Signed-off-by: Sven Strickroth <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 1 +
libraries/display_tbl.lib.php | 7 ++++++-
2 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index dbcc2ad..77d630c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@ phpMyAdmin - ChangeLog
- bug #3375325 [interface] Page list in navigation frame looks odd
- bug #3313235 [interface] Error div misplaced
- bug #3374802 [interface] Comment on a column breaks inline editing
+- bug #3383711 [display] Order by a column in a view doesn't work in some cases
3.4.4.0 (not yet released)
- bug #3323060 [parser] SQL parser breaks AJAX requests if query has unclosed
quotes
diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index c871612..3fa26c1 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -766,8 +766,10 @@ function PMA_displayTableHeaders(&$is_display,
&$fields_meta, $fields_cnt = 0, $
// the orgname member does not exist for all MySQL versions
// but if found, it's the one on which to sort
$name_to_use_in_sort = $fields_meta[$i]->name;
+ $is_orgname = false;
if (isset($fields_meta[$i]->orgname) &&
strlen($fields_meta[$i]->orgname)) {
$name_to_use_in_sort = $fields_meta[$i]->orgname;
+ $is_orgname = true;
}
// $name_to_use_in_sort might contain a space due to
// formatting of function expressions like "COUNT(name )"
@@ -794,12 +796,15 @@ function PMA_displayTableHeaders(&$is_display,
&$fields_meta, $fields_cnt = 0, $
// 2.1.3 Check the field name for a bracket.
// If it contains one, it's probably a function column
// like 'COUNT(`field`)'
- if (strpos($name_to_use_in_sort, '(') !== false) {
+ // It still might be a column name of a view. See bug
#3383711
+ // Check is_orgname.
+ if (strpos($name_to_use_in_sort, '(') !== false && ! $is_orgname) {
$sort_order = ' ORDER BY ' . $name_to_use_in_sort . ' ';
} else {
$sort_order = ' ORDER BY ' . $sort_tbl .
PMA_backquote($name_to_use_in_sort) . ' ';
}
unset($name_to_use_in_sort);
+ unset($is_orgname);
// 2.1.4 Do define the sorting URL
if (! $is_in_sort) {
hooks/post-receive
--
phpMyAdmin
------------------------------------------------------------------------------
BlackBerry® DevCon Americas, Oct. 18-20, San Francisco, CA
The must-attend event for mobile developers. Connect with experts.
Get tools for creating Super Apps. See the latest technologies.
Sessions, hands-on labs, demos & much more. Register early & save!
http://p.sf.net/sfu/rim-blackberry-1
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
