From 0b9e198094c472bcf0812e0453e3d4be80c2b4f6 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Mon, 16 Jul 2018 16:02:42 +1000 Subject: [PATCH 1/3] Fix #14435 Event scheduler status toggle doesn't work Signed-off-by: Madhura Jayaratne --- ChangeLog | 1 + js/functions.js | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8f65a02f055..7cc95f2932e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ phpMyAdmin - ChangeLog - issue #14171 2FA configuration fails if PHP doesn't have GD support - issue #14390 Can't unhide tables - issue #14382 "Visualize GIS data" icon missing +- issue #14435 Event scheduler status toggle doesn't work 4.8.2 (2018-06-21) - issue #14370 WHERE 0 causes Fatal error diff --git a/js/functions.js b/js/functions.js index 262defed3b2..fd19f37dc2b 100644 --- a/js/functions.js +++ b/js/functions.js @@ -4032,8 +4032,8 @@ var toggleButton = function ($obj) { addClass = 'on'; } - var params = { 'ajax_request': true }; - $.post(url, params, function (data) { + var parts = url.split('?'); + $.post(parts[0], parts[1] + '&ajax_request=true', function (data) { if (typeof data !== 'undefined' && data.success === true) { PMA_ajaxRemoveMessage($msg); $container From d9797819ad0a033c658e7bda28843d8d1fef0e36 Mon Sep 17 00:00:00 2001 From: Lakshay arora Date: Fri, 29 Jun 2018 22:42:47 +0530 Subject: [PATCH 2/3] Fix #14365, View not working on multiple servers Fixes #14365 Signed-Off-By: Lakshay arora --- js/functions.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/js/functions.js b/js/functions.js index fd19f37dc2b..0cbb39e4ecd 100644 --- a/js/functions.js +++ b/js/functions.js @@ -4543,7 +4543,8 @@ function PMA_createViewDialog ($this) { var $msg = PMA_ajaxShowMessage(); var syntaxHighlighter = null; var sep = PMA_commonParams.get('arg_separator'); - $.get($this.attr('href') + sep + 'ajax_request=1' + sep + 'ajax_dialog=1', function (data) { + params = $this.getPostData(); + $.get($this.attr('href') + sep + 'ajax_request=1' + sep + 'ajax_dialog=1' + sep + params, function (data) { if (typeof data !== 'undefined' && data.success === true) { PMA_ajaxRemoveMessage($msg); var buttonOptions = {}; From be6b8d48eb645c87ebe1ea44f5803f4411ca6b86 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Tue, 17 Jul 2018 09:02:22 +1000 Subject: [PATCH 3/3] ChangeLog entry for #14365. Load SQL query from the query parameters Signed-off-by: Madhura Jayaratne --- ChangeLog | 1 + view_create.php | 6 ++---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7cc95f2932e..dc4665a5c5d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,7 @@ phpMyAdmin - ChangeLog - issue #14390 Can't unhide tables - issue #14382 "Visualize GIS data" icon missing - issue #14435 Event scheduler status toggle doesn't work +- issue #14365, View not working on multiple servers 4.8.2 (2018-06-21) - issue #14370 WHERE 0 causes Fatal error diff --git a/view_create.php b/view_create.php index 184d3f0d023..0a25ced57cb 100644 --- a/view_create.php +++ b/view_create.php @@ -40,10 +40,6 @@ 'INVOKER' ); -if (empty($sql_query)) { - $sql_query = ''; -} - // View name is a compulsory field if (isset($_REQUEST['view']['name']) && empty($_REQUEST['view']['name']) @@ -175,6 +171,8 @@ exit; } +$sql_query = ! empty($_GET['sql_query']) ? $_GET['sql_query'] : ''; + // prefill values if not already filled from former submission $view = array( 'operation' => 'create',