nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'QA_3_3'

Browse Source 
Conflicts:
	Documentation.html
	README
	libraries/Config.class.php
	translators.html
This commit is contained in:
Michal Čihař
2010-04-07 09:24:12 +02:00
parent 8b290ea2ab 0fc25ac293
commit 08cda2f076
3 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -63,6 +63,8 @@ $Id$
thanks to Brian Douglass - bhdouglass thanks to Brian Douglass - bhdouglass
3.3.3.0 (not yet released) 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) 3.3.2.0 (not yet released)
- patch #2969449 [core] Name for MERGE engine varies depending on the - patch #2969449 [core] Name for MERGE engine varies depending on the

16
libraries/Config.class.php
View File

@@ -330,7 +330,7 @@ class PMA_Config
/** /**
* loads configuration from $source, usally the config file * 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 * @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) * (must be called after config.inc.php has been merged)
*/ */
function checkPermissions() function checkPermissions()
@@ -535,11 +535,11 @@ class PMA_Config
$fontsize = 0; $fontsize = 0;
} }
return ( return (
$fontsize + $fontsize +
$this->source_mtime + $this->source_mtime +
$this->default_source_mtime + $this->default_source_mtime +
$_SESSION['PMA_Theme']->mtime_info + $_SESSION['PMA_Theme']->mtime_info +
$_SESSION['PMA_Theme']->filesize_info) $_SESSION['PMA_Theme']->filesize_info)
. (isset($_SESSION['tmp_user_values']['custom_color']) ? substr($_SESSION['tmp_user_values']['custom_color'],1,6) : ''); . (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(); $url = array();
} }
} }
// If we don't have scheme, we didn't have full URL so we need to // If we don't have scheme, we didn't have full URL so we need to
// dig deeper // dig deeper
if (empty($url['scheme'])) { if (empty($url['scheme'])) {

12
navigation.php
View File

@@ -577,7 +577,8 @@ function PMA_displayTableList($tables, $visible = false,
echo '<ul id="subel' . $element_counter . '" style="display: none">'; echo '<ul id="subel' . $element_counter . '" style="display: none">';
} }
foreach ($tables as $group => $table) { 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'] $common_url_query = $GLOBALS['common_url_query']
. '&amp;tbl_group=' . urlencode($tab_group_full . $group); . '&amp;tbl_group=' . urlencode($tab_group_full . $group);
@@ -633,6 +634,15 @@ function PMA_displayTableList($tables, $visible = false,
} }
echo '</li>' . "\n"; echo '</li>' . "\n";
} elseif (is_array($table)) { } 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']); $link_title = PMA_getTitleForTarget($GLOBALS['cfg']['LeftDefaultTabTable']);
// quick access icon next to each table name // quick access icon next to each table name
echo '<li>' . "\n"; echo '<li>' . "\n";