From d1075ecb1a3622e8e1f5deb524e9c1f0aeee0d49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Fri, 2 Jun 2017 18:01:39 +0200
Subject: [PATCH] Pass common parameters when changing theme
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This avoids reseting server setting.

Fixes #13314

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 ChangeLog                  | 1 +
 libraries/ThemeManager.php | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 6089bf5974..fb75c9fdba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@ phpMyAdmin - ChangeLog
 ======================
 
 4.7.2 (not yet released)
+- issue #13314 Make theme selection keep current server
 
 4.7.1 (2017-05-25)
 - issue #13132 Always execute tracking queries as controluser
diff --git a/libraries/ThemeManager.php b/libraries/ThemeManager.php
index 18de556ead..8c07e9e3bb 100644
--- a/libraries/ThemeManager.php
+++ b/libraries/ThemeManager.php
@@ -367,8 +367,9 @@ class ThemeManager
         $select_box = '';
 
         if ($form) {
-            $select_box .= '<form name="setTheme" method="get"';
+            $select_box .= '<form name="setTheme" method="post"';
             $select_box .= ' action="index.php" class="disableAjax">';
+            $select_box .= URL::getHiddenInputs();
         }
 
         $theme_preview_path= './themes.php';