Merge branch 'QA_4_9' into QA_5_0

Signed-off-by: William Desportes <williamdes@wdes.fr>
phpmyadmin · Oct 17, 2019 · 2efeb11 · 2efeb11
2 parents 389945b + e95a73e
commit 2efeb11
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 5 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -44,6 +44,9 @@ phpMyAdmin - ChangeLog
 - issue #15304 Fix ssl_use php error
 - issue #14804 Fix undefined index: ssl_* variables
 - issue #14245 Fix mysql 8.0.3 and above fails on advisor
+- issue #15499 Fix unparenthesized php deprecation
+- issue #15482 Fix URL encoding plus sign (+) in the table or DB name when configuring foreign keys
+- issue #14898 Fixed bottom table in list in left panel blocked by horizontal scroll bar
 
 4.9.1 (2019-09-20)
 - issue #15313 Added support for Twig 2

diff --git a/js/table/relation.js b/js/table/relation.js
@@ -74,10 +74,12 @@ TableRelation.getDropdownValues = function ($dropdown) {
     }
     var $msgbox = Functions.ajaxShowMessage();
     var $form = $dropdown.parents('form');
+    var $db = $form.find('input[name="db"]').val();
+    var $table = $form.find('input[name="table"]').val();
     var argsep = CommonParams.get('arg_separator');
     var params = 'getDropdownValues=true' + argsep + 'ajax_request=true' +
-        argsep + 'db=' + $form.find('input[name="db"]').val() +
-        argsep + 'table=' + $form.find('input[name="table"]').val() +
+        argsep + 'db=' + encodeURIComponent($db) +
+        argsep + 'table=' + encodeURIComponent($table) +
         argsep + 'foreign=' + (foreign !== '') +
         argsep + 'foreignDb=' + encodeURIComponent(foreignDb) +
         (foreignTable !== null ?

diff --git a/libraries/tbl_columns_definition_form.inc.php b/libraries/tbl_columns_definition_form.inc.php
@@ -535,8 +535,9 @@
     'max_rows' => intval($GLOBALS['cfg']['MaxRows']),
     'char_editing' => isset($GLOBALS['cfg']['CharEditing']) ? $GLOBALS['cfg']['CharEditing'] : null,
     'attribute_types' => $GLOBALS['dbi']->types->getAttributes(),
-    'privs_available' => isset($GLOBALS['col_priv']) ? $GLOBALS['col_priv'] : false
-        && isset($GLOBALS['is_reload_priv']) ? $GLOBALS['is_reload_priv'] : false,
+    'privs_available' => ((isset($GLOBALS['col_priv']) ? $GLOBALS['col_priv'] : false)
+        && (isset($GLOBALS['is_reload_priv']) ? $GLOBALS['is_reload_priv'] : false)
+    ),
     'max_length' => $GLOBALS['dbi']->getVersion() >= 50503 ? 1024 : 255,
     'have_partitioning' => Partition::havePartitioning(),
     'dbi' => $GLOBALS['dbi'],

diff --git a/themes/original/scss/_common.scss b/themes/original/scss/_common.scss
@@ -807,6 +807,10 @@ form.login label {
   display: inline-block;
 }
 
+li.last.database {
+  margin-bottom: 20px !important;;
+}
+
 /* specific elements */
 
 /* topmenu */

diff --git a/themes/pmahomme/scss/_common.scss b/themes/pmahomme/scss/_common.scss
@@ -1082,7 +1082,7 @@ form.login {
 }
 
 li.last.database {
-  margin-bottom: 15px;
+  margin-bottom: 15px !important;;
 }
 
 /* specific elements */