Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Čihař <michal@cihar.com>2017-11-29 13:00:17 +0300
committerMichal Čihař <michal@cihar.com>2017-11-29 16:16:31 +0300
commit3b6a994dcdf2cbcfa23caa51b3719ba924aab20a (patch)
tree8db6b6e7958f33c64e14b395fae03506cbe3c8cf /prefs_manage.php
parent63f5b90ad53613dc4529f0711b2cf1c3a7e55d3c (diff)
Move collation connection setting to user preferences
It is now handled same way as other user settings. Issue #11688 Issue #13466 Signed-off-by: Michal Čihař <michal@cihar.com>
Diffstat (limited to 'prefs_manage.php')
-rw-r--r--prefs_manage.php5
1 files changed, 0 insertions, 5 deletions
diff --git a/prefs_manage.php b/prefs_manage.php
index a87ec2c63c..740ec36187 100644
--- a/prefs_manage.php
+++ b/prefs_manage.php
@@ -160,11 +160,6 @@ if (isset($_POST['submit_export'])
) {
$params['lang'] = $config['lang'];
}
- if (isset($config['collation_connection'])
- && $config['collation_connection'] != $GLOBALS['collation_connection']
- ) {
- $params['collation_connection'] = $config['collation_connection'];
- }
// save settings
$result = UserPreferences::save($cf->getConfigArray());