Merge branch 'MAINT_4_1_14' into STABLE

phpmyadmin · Apr 26, 2014 · 2ef7a1e · 2ef7a1e
2 parents 1b204a6 + 4bb85f5
commit 2ef7a1e
Show file tree

Hide file tree

Showing 25 changed files with 849 additions and 855 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,6 +1,12 @@
 phpMyAdmin - ChangeLog
 ======================
 
+4.1.14.0 (2014-04-26)
+- bug #4365 Creating bookmark with multiple queries not working
+- bug #4372 Changing browser transformation results in unnecessary table rebuild
+- bug #4375 Group two DB, one's name is the prefix of the other one
+- bug #4376 [interface] Login fields show in separate line
+
 4.1.13.0 (2014-04-13)
 - bug #4279 CTRL + up or down moves 2 fields
 - bug #4336 List server css style wrong
@@ -10,9 +16,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
@@ -21,19 +27,19 @@ 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
 - bug #4278 reCaptcha re-login requires double effort
 - 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
@@ -59,7 +65,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

diff --git a/README b/README
@@ -1,7 +1,7 @@
 phpMyAdmin - Readme
 ===================
 
-Version 4.1.13
+Version 4.1.14
 
 A set of PHP-scripts to manage MySQL over the web.
 

diff --git a/doc/conf.py b/doc/conf.py
@@ -49,7 +49,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = '4.1.13'
+version = '4.1.14'
 # The full version, including alpha/beta/rc tags.
 release = version
 

diff --git a/import.php b/import.php
@@ -624,6 +624,15 @@
         null, null
     );
 } else if ($result) {
+    // Save a Bookmark with more than one queries (if Bookmark label given).
+    if (! empty($_POST['bkm_label']) && ! empty($import_text)) {
+        PMA_storeTheQueryAsBookmark(
+            $db, $GLOBALS['cfg']['Bookmark']['user'],
+            $import_text, $_POST['bkm_label'],
+            isset($_POST['bkm_replace']) ? $_POST['bkm_replace'] : null
+        );
+    }
+
     $response = PMA_Response::getInstance();
     $response->isSuccess(true);
     $response->addJSON('message', PMA_Message::success($msg));

diff --git a/import_status.php b/import_status.php
@@ -17,8 +17,13 @@
  * Until this is fixed, we need to load the default session to load the data,
  * export the upload progress information from there,
  * and re-import after switching to our session.
+ *
+ * However, since https://github.com/phpmyadmin/phpmyadmin/commit/063a2d99
+ * we have deactivated this feature, so the corresponding code is now 
+ * commented out.
  */
 
+/*
 if (version_compare(PHP_VERSION, '5.4.0', '>=')
     && ini_get('session.upload_progress.enabled')
 ) {
@@ -40,12 +45,14 @@
     session_name('phpMyAdmin');
     session_id($_COOKIE['phpMyAdmin']);
 }
+ */
 
 define('PMA_MINIMUM_COMMON', 1);
 
 require_once 'libraries/common.inc.php';
 require_once 'libraries/display_import_ajax.lib.php';
 
+/*
 if (defined('SESSIONUPLOAD')) {
     // write sessionupload back into the loaded PMA session
 
@@ -63,6 +70,7 @@
         }
     }
 }
+ */
 
 // AJAX requests can't be cached!
 PMA_noCacheHeader();

diff --git a/js/common.js b/js/common.js
@@ -41,9 +41,9 @@ var PMA_commonParams = (function () {
             for (var i in obj) {
                 if (params[i] !== undefined && params[i] !== obj[i]) {
                     reload = true;
-                    if (i == 'db' || i == 'table') {
-                        updateNavigation = true;
-                    }
+                }
+                if (i == 'db' || i == 'table') {
+                    updateNavigation = true;
                 }
                 params[i] = obj[i];
             }
@@ -77,9 +77,9 @@ var PMA_commonParams = (function () {
             var updateNavigation = false;
             if (params[name] !== undefined && params[name] !== value) {
                 PMA_querywindow.refresh();
-                if (name == 'db' || name == 'table') {
-                    updateNavigation = true;
-                }
+            }
+            if (name == 'db' || name == 'table') {
+                updateNavigation = true;
             }
             params[name] = value;
             if (updateNavigation) {

diff --git a/js/navigation.js b/js/navigation.js
@@ -957,16 +957,11 @@ var PMA_fastFilter = {
     getSearchClause2: function ($this) {
         var $filterContainer = $this.closest('div.list_container');
         var $filterInput = $([]);
-        while (1) {
-            if ($filterContainer.find('li.fast_filter:not(.db_fast_filter) input.searchClause').length !== 0) {
-                $filterInput = $filterContainer.find('li.fast_filter:not(.db_fast_filter) input.searchClause');
-                break;
-            } else if (! $filterContainer.is('div.list_container')) {
-                break;
-            }
-            $filterContainer = $filterContainer
-                .parent()
-                .closest('div.list_container');
+        if ($filterContainer
+            .children('li.fast_filter:not(.db_fast_filter) input.searchClause')
+            .length !== 0) {
+            $filterInput = $filterContainer
+                .children('li.fast_filter:not(.db_fast_filter) input.searchClause');
         }
         var searchClause2 = '';
         if ($filterInput.length !== 0 &&

diff --git a/libraries/Config.class.php b/libraries/Config.class.php
@@ -114,7 +114,7 @@ function __construct($source = null)
      */
     function checkSystem()
     {
-        $this->set('PMA_VERSION', '4.1.13');
+        $this->set('PMA_VERSION', '4.1.14');
         /**
          * @deprecated
          */

diff --git a/libraries/navigation/NavigationTree.class.php b/libraries/navigation/NavigationTree.class.php
@@ -557,6 +557,12 @@ public function groupNode($node)
                         }
                     }
                 }
+                //Bug #4375: 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) {