Merge branch 'QA_4_8'

Signed-off-by: William Desportes <williamdes@wdes.fr>
phpmyadmin · Mar 1, 2019 · 42e1a33 · 42e1a33
2 parents cfeb5db + f3589af
commit 42e1a33
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 9 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -34,6 +34,9 @@ phpMyAdmin - ChangeLog
 - issue #14515 Values cannot be edited in SYSTEM VERSIONING tables with INVISIBLE timestamps
 - issue        Fix header icon on server plugins page
 - issue #14298 Fixed error 500 on MultiTableQuery page when a empty query is passed
+- issue #14402 Fixed fatal javascript error while adding index to a new column
+- issue #14896 Fixed issue with plus/minus icon when refreshing an expanded database
+- issue #14922 Fixed json encode error in export
 
 4.8.5 (2019-01-25)
 - issue        Developer debug data was saved to the PHP error log

diff --git a/doc/config.rst b/doc/config.rst
@@ -2708,7 +2708,7 @@ Web server settings
     want to use rules for IP addresses behind proxy.
 
     The following example specifies that phpMyAdmin should trust a
-    HTTP\_X\_FORWARDED\_FOR (``X -Forwarded-For``) header coming from the proxy
+    HTTP\_X\_FORWARDED\_FOR (``X-Forwarded-For``) header coming from the proxy
     1.2.3.4:
 
     .. code-block:: php

diff --git a/js/indexes.js b/js/indexes.js
@@ -726,6 +726,13 @@ AJAX.registerOnload('indexes.js', function () {
 
         if (index_choice === 'none') {
             PMA_removeColumnFromIndex(col_index);
+            var id = 'index_name_' + '0' + '_8';
+            var $name = $('#' + id);
+            if ($name.length === 0) {
+                $name = $('<a id="' + id + '" href="#" class="ajax show_index_dialog"></a>');
+                $name.insertAfter($('select[name="field_key[' + '0' + ']"]'));
+            }
+            $name.html('');
             return false;
         }
 
@@ -771,14 +778,16 @@ AJAX.registerOnload('indexes.js', function () {
         var array_index  = previous_index[1];
 
         var source_array = PMA_getIndexArray(index_choice);
-        var source_length = source_array[array_index].columns.length;
+        if(source_array != null){
+            var source_length = source_array[array_index].columns.length;
 
-        var target_columns = [];
-        for (var i = 0; i < source_length; i++) {
-            target_columns.push(source_array[array_index].columns[i].col_index);
-        }
+            var target_columns = [];
+            for (var i = 0; i < source_length; i++) {
+                target_columns.push(source_array[array_index].columns[i].col_index);
+            }
 
-        PMA_showAddIndexDialog(source_array, array_index, target_columns, -1, source_array[array_index]);
+            PMA_showAddIndexDialog(source_array, array_index, target_columns, -1, source_array[array_index]);
+        }
     });
 
     $('#index_frm').on('submit', function () {

diff --git a/libraries/classes/Navigation/Nodes/Node.php b/libraries/classes/Navigation/Nodes/Node.php
@@ -794,7 +794,7 @@ public function getIcon($match)
         if (! $GLOBALS['cfg']['NavigationTreeEnableExpansion']
         ) {
             return '';
-        } elseif ($match && ! $this->is_group) {
+        } elseif ($match) {
             $this->visible = true;
 
             return Util::getImage('b_minus');

diff --git a/libraries/classes/Plugins/Export/ExportJson.php b/libraries/classes/Plugins/Export/ExportJson.php
@@ -270,7 +270,11 @@ public function exportData(
                 $data[$columns[$i]] = $record[$i];
             }
 
-            if (! $this->export->outputHandler($this->encode($data))) {
+            $encodedData = $this->encode($data);
+            if (! $encodedData) {
+                return false;
+            }
+            if (! $this->export->outputHandler($encodedData)) {
                 return false;
             }
         }