Merge branch 'QA_4_8'

phpmyadmin · Jul 16, 2018 · 90006d9 · 90006d9
2 parents f80b448 + be6b8d4
commit 90006d9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -19,6 +19,8 @@ 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
+- issue #14365, View not working on multiple servers
 
 4.8.2 (2018-06-21)
 - issue #14370 WHERE 0 causes Fatal error

diff --git 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

diff --git a/view_create.php b/view_create.php
@@ -44,10 +44,6 @@
     'INVOKER'
 ];
 
-if (empty($sql_query)) {
-    $sql_query = '';
-}
-
 // View name is a compulsory field
 if (isset($_REQUEST['view']['name'])
     && empty($_REQUEST['view']['name'])
@@ -180,6 +176,8 @@
     exit;
 }
 
+$sql_query = ! empty($_GET['sql_query']) ? $_GET['sql_query'] : '';
+
 // prefill values if not already filled from former submission
 $view = [
     'operation' => 'create',