From 5014a289f3a3d0d4ef04654d7c1adeb9e4cb6835 Mon Sep 17 00:00:00 2001 From: Nitish Bahl Date: Tue, 22 Jan 2019 18:30:54 +0530 Subject: [PATCH 1/6] fixes #14734 Invalid default value for bit field Signed-off-by: Nitish Bahl --- libraries/classes/Util.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/classes/Util.php b/libraries/classes/Util.php index af23753d99..89cadd6aa4 100644 --- a/libraries/classes/Util.php +++ b/libraries/classes/Util.php @@ -2757,7 +2757,7 @@ class Util */ public static function convertBitDefaultValue($bit_default_value) { - return rtrim(ltrim($bit_default_value, "b'"), "'"); + return rtrim(ltrim(htmlspecialchars_decode($bit_default_value, ENT_QUOTES), "b'"), "'"); } /** From 43d9d6fb38812210c925b739bac6ebfa96182355 Mon Sep 17 00:00:00 2001 From: Renan Porto Date: Wed, 6 Mar 2019 18:44:46 -0300 Subject: [PATCH 2/6] Fix #14943 - Loading Forever when creating new view without filling any field Fixes: #14943 Signed-off-by: Renan Porto --- js/functions.js | 3 +-- templates/view_create.twig | 12 ++++-------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/js/functions.js b/js/functions.js index a6313438a0..8101e4c39b 100644 --- a/js/functions.js +++ b/js/functions.js @@ -4550,7 +4550,6 @@ AJAX.registerOnload('functions.js', function () { function PMA_createViewDialog ($this) { var $msg = PMA_ajaxShowMessage(); - var syntaxHighlighter = null; var sep = PMA_commonParams.get('arg_separator'); var params = getJSConfirmCommonParam(this, $this.getPostData()); params += sep + 'ajax_dialog=1'; @@ -4570,7 +4569,7 @@ function PMA_createViewDialog ($this) { $('.result_query').html(data.message); PMA_reloadNavigation(); } else { - PMA_ajaxShowMessage(data.error, false); + PMA_ajaxShowMessage(data.error); } }); }; diff --git a/templates/view_create.twig b/templates/view_create.twig index 0d96d04cee..a89b795184 100644 --- a/templates/view_create.twig +++ b/templates/view_create.twig @@ -108,15 +108,11 @@ - {% if ajax_dialog %} -
- - -
- {% else %} - + + + + {% if ajax_dialog == false %} - {% endif %} From f6e00326dae072479870ad410cdc26d32f7fbd62 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Wed, 6 Mar 2019 23:08:42 +0100 Subject: [PATCH 3/6] Add ChangeLog entry for #14943 Signed-off-by: William Desportes --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index b81c6d4ee5..eb3b7eabb6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,7 @@ phpMyAdmin - ChangeLog - issue #14832 Show Designer combo boxes when adding a constraint - issue #14948 Fix change password is not showing password strength difference at the second attempt - issue #14868 Fix edit view +- issue #14943 Fixed loading Forever when creating new view without filling any field 4.8.5 (2019-01-25) - issue Developer debug data was saved to the PHP error log From b36ae1bc1d4b5f636d1b005429fd5b4a9aaddc68 Mon Sep 17 00:00:00 2001 From: Michael Tsang Date: Fri, 11 Jan 2019 19:54:05 +0800 Subject: [PATCH 4/6] fix Bookmark::get() id matching SQL fix a mistake in SQL which causes default bookmark not working Signed-off-by: Michael Tsang --- libraries/classes/Bookmark.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/classes/Bookmark.php b/libraries/classes/Bookmark.php index 1fc833bae1..9543f3e209 100644 --- a/libraries/classes/Bookmark.php +++ b/libraries/classes/Bookmark.php @@ -358,7 +358,7 @@ class Bookmark $query .= ")"; } $query .= " AND " . Util::backquote($id_field) - . " = " . $dbi->escapeString($id) . " LIMIT 1"; + . " = '" . $dbi->escapeString($id) . "' LIMIT 1"; $result = $dbi->fetchSingleRow($query, 'ASSOC', DatabaseInterface::CONNECT_CONTROL); if (! empty($result)) { From 9a2707e063a129ab93295e4b8588afbe31b29fc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Wed, 6 Mar 2019 19:46:28 -0300 Subject: [PATCH 5/6] Add ChangeLog entry for #14843 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ci skip] Signed-off-by: Maurício Meneghini Fauth --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index eb3b7eabb6..45a30b8608 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,6 +21,7 @@ phpMyAdmin - ChangeLog - issue #14948 Fix change password is not showing password strength difference at the second attempt - issue #14868 Fix edit view - issue #14943 Fixed loading Forever when creating new view without filling any field +- issue #14843 Fix Bookmark::get() id matching SQL 4.8.5 (2019-01-25) - issue Developer debug data was saved to the PHP error log From 85438d8dfdf3d33484cc821c32f12cd6c510ce3a Mon Sep 17 00:00:00 2001 From: William Desportes Date: Wed, 6 Mar 2019 23:57:29 +0100 Subject: [PATCH 6/6] Add ChangeLog entry for #14734 Signed-off-by: William Desportes --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 45a30b8608..958d4fcb40 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,6 +22,7 @@ phpMyAdmin - ChangeLog - issue #14868 Fix edit view - issue #14943 Fixed loading Forever when creating new view without filling any field - issue #14843 Fix Bookmark::get() id matching SQL +- issue #14734 Fixed invalid default value for bit field 4.8.5 (2019-01-25) - issue Developer debug data was saved to the PHP error log