The branch, master has been updated via 08cda2f0763d257545c7588718b0e71743733dcb (commit) via 0fc25ac29348166b85a272400c4f28466d343f29 (commit) via 8a7b66f3a0e0a45d87ba60cdbf72b417d80194b9 (commit) via 210b7631da5ddd30ae2d46e90226bc0b2c39d3a0 (commit) from 8b290ea2ab0716ec365482d3e548a39e2b83468d (commit)

- Log ----------------------------------------------------------------- commit 08cda2f0763d257545c7588718b0e71743733dcb Merge: 8b290ea2ab0716ec365482d3e548a39e2b83468d 0fc25ac29348166b85a272400c4f28466d343f29 Author: Michal Čihař mcihar@novell.com Date: Wed Apr 7 09:24:12 2010 +0200

Merge branch 'QA_3_3'

Conflicts: Documentation.html README libraries/Config.class.php translators.html

-----------------------------------------------------------------------

Summary of changes: ChangeLog | 2 ++ libraries/Config.class.php | 16 ++++++++-------- navigation.php | 12 +++++++++++- 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog index 7751086..6dc4a9f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -63,6 +63,8 @@ $Id$ thanks to Brian Douglass - bhdouglass

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/Config.class.php b/libraries/Config.class.php index 700de97..9465ad7 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -330,7 +330,7 @@ class PMA_Config

/** * loads configuration from $source, usally the config file - * should be called on object creation + * should be called on object creation * * @param string $source config file */ @@ -462,7 +462,7 @@ class PMA_Config }

/** - * verifies the permissions on config file (if asked by configuration) + * verifies the permissions on config file (if asked by configuration) * (must be called after config.inc.php has been merged) */ function checkPermissions() @@ -535,11 +535,11 @@ class PMA_Config $fontsize = 0; } return ( - $fontsize + - $this->source_mtime + - $this->default_source_mtime + - $_SESSION['PMA_Theme']->mtime_info + - $_SESSION['PMA_Theme']->filesize_info) + $fontsize + + $this->source_mtime + + $this->default_source_mtime + + $_SESSION['PMA_Theme']->mtime_info + + $_SESSION['PMA_Theme']->filesize_info) . (isset($_SESSION['tmp_user_values']['custom_color']) ? substr($_SESSION['tmp_user_values']['custom_color'],1,6) : ''); }

@@ -835,7 +835,7 @@ class PMA_Config $url = array(); } } - + // If we don't have scheme, we didn't have full URL so we need to // dig deeper if (empty($url['scheme'])) { diff --git a/navigation.php b/navigation.php index d7d3b02..3699f76 100644 --- a/navigation.php +++ b/navigation.php @@ -577,7 +577,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'] . '&amp;tbl_group=' . urlencode($tab_group_full . $group);

@@ -633,6 +634,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