From 412377ca52f56675db13d3bd1627ae82dc1d02e7 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Fri, 26 Nov 2010 12:46:51 -0500 Subject: [PATCH 1/4] missing title --- libraries/header.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/header.inc.php b/libraries/header.inc.php index 33531ea6e..6ce37b82b 100644 --- a/libraries/header.inc.php +++ b/libraries/header.inc.php @@ -122,7 +122,7 @@ if (!$GLOBALS['is_ajax_request']) { $GLOBALS['cfg']['DefaultTabDatabase'], PMA_generate_common_url($GLOBALS['db']), $GLOBALS['db'], - '', + __('Database'), 's_tbl.png'); // if the table is being dropped, $_REQUEST['purge'] is set // (it always contains "1") From 36337ff8deec0271ea98d9e5495ddc753cbbe4b7 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sun, 28 Nov 2010 07:40:29 -0500 Subject: [PATCH 2/4] bug #3119884, path not found (in case the kit is English-only) --- libraries/select_lang.lib.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libraries/select_lang.lib.php b/libraries/select_lang.lib.php index f1a3725aa..3ed35e4d6 100644 --- a/libraries/select_lang.lib.php +++ b/libraries/select_lang.lib.php @@ -343,10 +343,8 @@ function PMA_langList() /* Open the directory */ $handle = @opendir($GLOBALS['lang_path']); + /* This can happen if the kit is English-only */ if ($handle === FALSE) { - trigger_error('phpMyAdmin: path not found: ' - . $GLOBALS['lang_path'] . ', check your language directory.', - E_USER_WARNING); return $result; } @@ -363,7 +361,7 @@ function PMA_langList() } /** - * @global string path to the translations directory + * @global string path to the translations directory; may be absent if the kit is English-only */ $GLOBALS['lang_path'] = './locale/'; From 0d6cc8ca55a278ae4f2b671f33ae5029701fe705 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sun, 28 Nov 2010 07:40:29 -0500 Subject: [PATCH 3/4] bug #3119884, path not found (in case the kit is English-only) --- libraries/select_lang.lib.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libraries/select_lang.lib.php b/libraries/select_lang.lib.php index f1a3725aa..3ed35e4d6 100644 --- a/libraries/select_lang.lib.php +++ b/libraries/select_lang.lib.php @@ -343,10 +343,8 @@ function PMA_langList() /* Open the directory */ $handle = @opendir($GLOBALS['lang_path']); + /* This can happen if the kit is English-only */ if ($handle === FALSE) { - trigger_error('phpMyAdmin: path not found: ' - . $GLOBALS['lang_path'] . ', check your language directory.', - E_USER_WARNING); return $result; } @@ -363,7 +361,7 @@ function PMA_langList() } /** - * @global string path to the translations directory + * @global string path to the translations directory; may be absent if the kit is English-only */ $GLOBALS['lang_path'] = './locale/'; From ae764b973f6f07019824ab4a109f6cde96adec0e Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sun, 28 Nov 2010 08:15:53 -0500 Subject: [PATCH 4/4] fix merge conflicts --- ChangeLog | 2 ++ navigation.php | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index c120c04a2..8f641ae88 100644 --- a/ChangeLog +++ b/ChangeLog @@ -122,6 +122,8 @@ - bug #3087682 [interface] Do not apply LeftFrameDBSeparator on first character. + rfe #3111455 [interface] Column highlighting and marking in table view + Visual query builder +- patch #3112792 [navi] Left panel table grouping incorrect, + thanks to garas - garas 3.3.9.0 (not yet released) - bug [doc] Fix references to MySQL doc diff --git a/navigation.php b/navigation.php index bebdb19d0..a45277c1f 100644 --- a/navigation.php +++ b/navigation.php @@ -606,7 +606,7 @@ function PMA_displayTableList($tables, $visible = false, echo '' . "\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'])) { + while (isset($table['is' . $sep . 'group'])) { // get the array with the actual table information foreach ($table as $value) { if(is_array($value)) {