The branch, QA_3_3 has been updated
via 0fc25ac29348166b85a272400c4f28466d343f29 (commit)
via 8a7b66f3a0e0a45d87ba60cdbf72b417d80194b9 (commit)
from 210b7631da5ddd30ae2d46e90226bc0b2c39d3a0 (commit)
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 2 ++
libraries/select_lang.lib.php | 4 ++--
navigation.php | 12 +++++++++++-
3 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 354d1b1..23a468f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@ $Id$
$HeadURL:
https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/… $
3.3.3.0 (not yet released)
+- patch #2982480 [navi] Do not group if there would be one table in group,
+ thanks to Lorikeet Lee.
3.3.2.0 (not yet released)
- patch #2969449 [core] Name for MERGE engine varies depending on the
diff --git a/libraries/select_lang.lib.php b/libraries/select_lang.lib.php
index c1589c4..5e5762a 100644
--- a/libraries/select_lang.lib.php
+++ b/libraries/select_lang.lib.php
@@ -68,9 +68,9 @@ function PMA_langCheck()
if (! empty($_COOKIE['pma_lang'])) {
if (PMA_langSet($_COOKIE['pma_lang'])) {
return true;
- } elseif (!is_string($_COOKIE['lang'])) {
+ } elseif (!is_string($_COOKIE['pma_lang'])) {
/* Faked request, don't care on localisation */
- $GLOBALS['lang_failed_request'] = 'Yes';
+ $GLOBALS['lang_failed_cookie'] = 'Yes';
} else {
$GLOBALS['lang_failed_cookie'] = $_COOKIE['pma_lang'];
}
diff --git a/navigation.php b/navigation.php
index fb5e52c..17d0193 100644
--- a/navigation.php
+++ b/navigation.php
@@ -554,7 +554,8 @@ function PMA_displayTableList($tables, $visible = false,
echo '<ul id="subel' . $element_counter . '"
style="display: none">';
}
foreach ($tables as $group => $table) {
- if (isset($table['is' . $sep . 'group'])) {
+ // only allow grouping if the group has more than 1 table
+ if (isset($table['is' . $sep . 'group']) &&
$table['tab' . $sep . 'count'] > 1) {
$common_url_query = $GLOBALS['common_url_query']
. '&tbl_group=' . urlencode($tab_group_full . $group);
@@ -610,6 +611,15 @@ function PMA_displayTableList($tables, $visible = false,
}
echo '</li>' . "\n";
} elseif (is_array($table)) {
+ // the table was not grouped because it is the only one with its prefix
+ if (isset($table['is' . $sep . 'group'])) {
+ // get the array with the actual table information
+ foreach ($table as $value) {
+ if(is_array($value)) {
+ $table = $value;
+ }
+ }
+ }
$link_title =
PMA_getTitleForTarget($GLOBALS['cfg']['LeftDefaultTabTable']);
// quick access icon next to each table name
echo '<li>' . "\n";
hooks/post-receive
--
phpMyAdmin