diff --git a/ChangeLog b/ChangeLog index d520f4a58b..5a18f88434 100644 --- a/ChangeLog +++ b/ChangeLog @@ -48,6 +48,9 @@ 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 +- 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 diff --git a/js/functions.js b/js/functions.js index fa2c680e27..47c8a12ffd 100644 --- a/js/functions.js +++ b/js/functions.js @@ -4605,7 +4605,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'; @@ -4625,7 +4624,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/libraries/classes/Bookmark.php b/libraries/classes/Bookmark.php index 5f0876efb0..7dc1302ab5 100644 --- a/libraries/classes/Bookmark.php +++ b/libraries/classes/Bookmark.php @@ -377,7 +377,7 @@ class Bookmark $query .= ")"; } $query .= " AND " . Util::backquote($id_field) - . " = " . $dbi->escapeString((string) $id) . " LIMIT 1"; + . " = '" . $dbi->escapeString((string) $id) . "' LIMIT 1"; $result = $dbi->fetchSingleRow($query, 'ASSOC', DatabaseInterface::CONNECT_CONTROL); if (! empty($result)) { diff --git a/libraries/classes/Util.php b/libraries/classes/Util.php index 837ffc33de..0d1e564889 100644 --- a/libraries/classes/Util.php +++ b/libraries/classes/Util.php @@ -2843,7 +2843,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'"), "'"); } /** diff --git a/templates/view_create.twig b/templates/view_create.twig index 661cf0e5f2..bd9c9e53a6 100644 --- a/templates/view_create.twig +++ b/templates/view_create.twig @@ -108,16 +108,12 @@ - {% if ajax_dialog %} -
- - -
- {% else %} - - - - + + + + {% if ajax_dialog == false %} + + {% endif %}