From cd3ad518a780a41fe76c384aa527257049c5cd62 Mon Sep 17 00:00:00 2001 From: Hugues Peccatte Date: Sun, 20 Apr 2014 16:30:30 +0200 Subject: [PATCH 1/2] Group two databases, when one's name is the prefix of the second one. Signed-off-by: Hugues Peccatte --- libraries/navigation/NavigationTree.class.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libraries/navigation/NavigationTree.class.php b/libraries/navigation/NavigationTree.class.php index c8ed4228fb..e6c77abc33 100644 --- a/libraries/navigation/NavigationTree.class.php +++ b/libraries/navigation/NavigationTree.class.php @@ -572,6 +572,12 @@ class PMA_NavigationTree } } } + //Check if prefix is the name of a DB, to create a group. + foreach ($node->children as $child) { + if (array_key_exists($child->name, $prefixes)) { + $prefixes[$child->name]++; + } + } } foreach ($prefixes as $key => $value) { if ($value == 1) { From b393eabe1e6a9203607ea5bf2ed40694614c3f69 Mon Sep 17 00:00:00 2001 From: Hugues Peccatte Date: Mon, 21 Apr 2014 14:34:33 +0200 Subject: [PATCH 2/2] Update ChangeLog. Signed-off-by: Hugues Peccatte --- ChangeLog | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index fb69a0320c..cf70790216 100644 --- a/ChangeLog +++ b/ChangeLog @@ -47,9 +47,10 @@ phpMyAdmin - ChangeLog + rfe [interface] Highlight active left menu item in setup + rfe Filter on-screen rows during Browse Removed support for SQL Validator (SOAP service no longer offered) -- bug #4352 Settings > Manage: incorrect messages +- bug #4352 Settings > Manage: incorrect messages - bug #4337 "More" in Actions area doesn't collapse to fit available space - rfe #1518 Confirm dialog on accidentally leaving a page +- bug #4375 Group two DB, one's name is the prefix of the other one 4.1.14.0 (not yet released) - bug #4365 Creating bookmark with multiple queries not working @@ -63,9 +64,9 @@ phpMyAdmin - ChangeLog - bug #4353 makeProfilingChart is not defined - bug #4355 Precision specifier for DOUBLE type is truncated - bug #4346 Incorrect "Export incomplete" message -- bug #4359 Notices on create table page +- bug #4359 Notices on create table page - bug #4356 GROUPed selects show number of rows as if not grouped -- bug #4357 JS Form submitted on "enter" even if focus is inside a select field +- bug #4357 JS Form submitted on "enter" even if focus is inside a select field 4.1.12.0 (2014-03-27) - bug #4334 Add event : datepicker won't open @@ -74,7 +75,7 @@ phpMyAdmin - ChangeLog - bug #4326 Cannot find the import plugins which start with uppercase 'I' 4.1.11.0 (2014-03-23) -- bug #4335 reCaptcha problem (4.1.10 regression) +- bug #4335 reCaptcha problem (4.1.10 regression) 4.1.10.0 (2014-03-22) - bug #4301 Grid edit: "SELECT" query is replaced by "UPDATE" query after edit @@ -82,11 +83,11 @@ phpMyAdmin - ChangeLog - bug #4324 Datepicker not showing up on insert page - bug #3991 Problem selecting item in select boxes with the ENTER keystroke in some browsers - bug #4323 QueryWindow ignores CodeMirror -- bug None of the live charts shown on "Status -> Monitor" (Chrome) +- bug None of the live charts shown on "Status -> Monitor" (Chrome) 4.1.9.0 (2014-03-06) - bug #4279 CTRL + up or down moves two fields (part one) -- bug #4294 output as text radio clickable for "OpenDocument Text" export +- bug #4294 output as text radio clickable for "OpenDocument Text" export - bug #4297 DROP DATABASE tick box in export no longer works - bug #4291 Unable to export comments in OpenDocument text format - bug #4299 Deletion even when the user says "No" to the confirmation message @@ -112,7 +113,7 @@ phpMyAdmin - ChangeLog - Fixed altering table to DOUBLE/FLOAT field - bug #4292 Success message and failure message being shown together - bug #4293 opening new tab (using selflink) for import.php based actions - results in error and logout + results in error and logout 4.1.7.0 (2014-02-09) - bug #4245 initial Browse query does not match sorting order