Merge branch 'QA_4_8'

phpmyadmin · Mar 21, 2019 · f009dfd · f009dfd
2 parents 525326b + 9ffda07
commit f009dfd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -62,6 +62,7 @@ phpMyAdmin - ChangeLog
 - issue        Fixed error reporting javascript errors on multi server setup
 - issue        Fixed wrong property name on TableStructureController
 - issue #14811 Fix SHOW FULL TABLES FROM when a table is locked
+- issue #14916 Fix bug when creating or editing views
 
 4.8.5 (2019-01-25)
 - issue        Developer debug data was saved to the PHP error log

diff --git a/libraries/classes/Util.php b/libraries/classes/Util.php
@@ -1835,6 +1835,7 @@ public static function linkOrButton(
         if (($url_length > $GLOBALS['cfg']['LinkLengthLimit'])
             || ! $in_suhosin_limits
             || strpos($url, 'sql_query=') !== false
+            || strpos($url, 'view[as]=') !== false
         ) {
             $parts = explode('?', $url, 2);
             /*

diff --git a/view_create.php b/view_create.php
@@ -178,7 +178,7 @@
     exit;
 }
 
-$sql_query = ! empty($_GET['sql_query']) ? $_GET['sql_query'] : '';
+$sql_query = ! empty($_POST['sql_query']) ? $_POST['sql_query'] : '';
 
 // prefill values if not already filled from former submission
 $view = [
@@ -193,8 +193,8 @@
     'with' => '',
 ];
 
-if (Core::isValid($_GET['view'], 'array')) {
-    $view = array_merge($view, $_GET['view']);
+if (Core::isValid($_POST['view'], 'array')) {
+    $view = array_merge($view, $_POST['view']);
 }
 
 $url_params['db'] = $GLOBALS['db'];