From 6c8be44ccb00259f92052b67a5f39ccbfb7ac82a Mon Sep 17 00:00:00 2001 From: Rahul Gurung Date: Sun, 18 Aug 2019 19:10:24 +0530 Subject: [PATCH 1/7] fixed bottom-most table name blockage Signed-off-by: Rahul Gurung --- themes/pmahomme/css/common.css.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/pmahomme/css/common.css.php b/themes/pmahomme/css/common.css.php index 140d627e74..d5009d12ea 100644 --- a/themes/pmahomme/css/common.css.php +++ b/themes/pmahomme/css/common.css.php @@ -962,7 +962,7 @@ form.login select { } li.last.database{ - margin-bottom: 15px + margin-bottom: 15px !important; } /******************************************************************************/ /* specific elements */ From 936314bd7e09d9b12797103ac4dd8e25684688e5 Mon Sep 17 00:00:00 2001 From: Vadim Chernyshev Date: Tue, 1 Oct 2019 13:37:47 +0300 Subject: [PATCH 2/7] add encodeURIComponent Fixes: #15482 Signed-off-by: Vadim Chernyshev --- js/tbl_relation.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/js/tbl_relation.js b/js/tbl_relation.js index ffc0aff435..d7e87857f7 100644 --- a/js/tbl_relation.js +++ b/js/tbl_relation.js @@ -71,10 +71,12 @@ function getDropdownValues ($dropdown) { } var $msgbox = PMA_ajaxShowMessage(); var $form = $dropdown.parents('form'); + var $db = $form.find('input[name="db"]').val(); + var $table = $form.find('input[name="table"]').val(); var argsep = PMA_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 ? From 39d0b47322729b104be82e3533d6634c42c71a49 Mon Sep 17 00:00:00 2001 From: Dan Thorpe Date: Thu, 10 Oct 2019 12:40:55 +0100 Subject: [PATCH 3/7] FIX: Unparenthesized `a ? b : c ? d : e` is deprecated. Signed-off-by: Dan Thorpe Signed-off-by: Dan Thorpe --- libraries/tbl_columns_definition_form.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/tbl_columns_definition_form.inc.php b/libraries/tbl_columns_definition_form.inc.php index e83be4dc2c..9067e0a3b8 100644 --- a/libraries/tbl_columns_definition_form.inc.php +++ b/libraries/tbl_columns_definition_form.inc.php @@ -428,8 +428,8 @@ $html = Template::get('columns_definitions/column_definitions_form')->render([ '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(), From 5bef2d8e1f7f229539a05eea2be81c6b1698db67 Mon Sep 17 00:00:00 2001 From: Benoit Portrat Date: Tue, 15 Oct 2019 14:58:10 +0000 Subject: [PATCH 4/7] Translated using Weblate (French) Currently translated at 100.0% (3304 of 3304 strings) [CI skip] Translation: phpMyAdmin/4.9 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-9/fr/ Signed-off-by: Benoit Portrat --- po/fr.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/po/fr.po b/po/fr.po index a531fae2f2..85797b13f0 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs 4.0.0-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2019-10-11 12:34-0300\n" -"PO-Revision-Date: 2019-08-25 09:23+0000\n" -"Last-Translator: Olivier Humbert \n" +"PO-Revision-Date: 2019-10-16 15:52+0000\n" +"Last-Translator: Benoit Portrat \n" "Language-Team: French \n" "Language: fr\n" @@ -13,7 +13,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Generator: Weblate 3.9-dev\n" +"X-Generator: Weblate 3.9\n" #: ajax.php:21 ajax.php:50 export.php:196 libraries/classes/Export.php:1095 msgid "Bad type!" @@ -2978,7 +2978,7 @@ msgstr "me" #. l10n: Minimal week day name #: js/messages.php:884 msgid "Th" -msgstr "me" +msgstr "je" #. l10n: Minimal week day name #: js/messages.php:886 From 21378f8909016430c27290f19884eeca6b860356 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Thu, 17 Oct 2019 22:22:06 +0200 Subject: [PATCH 5/7] Add ChangeLog entry for #15499 Signed-off-by: William Desportes --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 35e7c55b3b..d348472b5b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ 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 4.9.1 (2019-09-20) - issue #15313 Added support for Twig 2 From d9e5414cec093e48f460118f0a99904e071a11af Mon Sep 17 00:00:00 2001 From: William Desportes Date: Thu, 17 Oct 2019 22:26:45 +0200 Subject: [PATCH 6/7] Add ChangeLog entry for #15482 Signed-off-by: William Desportes --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index d348472b5b..8416e364fb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ phpMyAdmin - ChangeLog - 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 4.9.1 (2019-09-20) - issue #15313 Added support for Twig 2 From e95a73ea081197b7ace7636b7f0a79732d51fd22 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Thu, 17 Oct 2019 22:47:54 +0200 Subject: [PATCH 7/7] Add ChangeLog entry for #14898 Signed-off-by: William Desportes --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 8416e364fb..16b385f6a4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ phpMyAdmin - ChangeLog - 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