From 914745dbaaed450b044475cdb0f6c68772f8ce02 Mon Sep 17 00:00:00 2001 From: Miki Date: Wed, 4 Jul 2018 15:00:28 -0700 Subject: [PATCH 1/2] Populate options for view create and edit (#14377) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miki (cherry picked from commit da8b6a90dfe1429b06bc7485043dad2b9d5cd610) Signed-off-by: Maurício Meneghini Fauth --- view_create.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/view_create.php b/view_create.php index a8f8277575..184d3f0d02 100644 --- a/view_create.php +++ b/view_create.php @@ -196,8 +196,11 @@ $url_params['db'] = $GLOBALS['db']; $url_params['reload'] = 1; echo Template::get('view_create')->render([ - 'ajax_dialog' => isset($_REQUEST['ajax_dialog']), - 'text_dir' => $text_dir, - 'url_params' => $url_params, - 'view' => $view, + 'ajax_dialog' => isset($_REQUEST['ajax_dialog']), + 'text_dir' => $text_dir, + 'url_params' => $url_params, + 'view' => $view, + 'view_algorithm_options' => $view_algorithm_options, + 'view_with_options' => $view_with_options, + 'view_security_options' => $view_security_options, ]); From 22a432eaac465b68e60288d1ab7a2a909f2b23ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Wed, 4 Jul 2018 19:09:01 -0300 Subject: [PATCH 2/2] Add ChangeLog entry for #14377 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maurício Meneghini Fauth --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 97c599cd07..6cf4ab0297 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ phpMyAdmin - ChangeLog - issue #14229 Fixes issue with recent table list - issue #14045 Fix slow performance on DB structure filtering - issue #14327 Fix Editing server variable not showing save or cancel option +- issue #14377 Populate options for view create and edit 4.8.2 (2018-06-21) - issue #14370 WHERE 0 causes Fatal error