From 157c4fb775783486b980075aba0982b69a77eab3 Mon Sep 17 00:00:00 2001 From: Crack Date: Fri, 30 Jul 2010 19:44:59 +0200 Subject: [PATCH] fixed some fields not saving due to equality conversions (eg. 0 == 'auto') fix user preferences menu display when tabs don't fit on screen --- libraries/config/ConfigFile.class.php | 2 +- libraries/user_preferences.inc.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/config/ConfigFile.class.php b/libraries/config/ConfigFile.class.php index a6acb94f3..afd116bab 100644 --- a/libraries/config/ConfigFile.class.php +++ b/libraries/config/ConfigFile.class.php @@ -165,7 +165,7 @@ class ConfigFile // remove if the path isn't protected and it's empty or has a default value $default_value = $this->getDefault($canonical_path); if (!isset($this->persistKeys[$canonical_path]) - && (($value == $default_value) || (empty($value) && empty($default_value)))) { + && (($value === $default_value) || (empty($value) && empty($default_value)))) { PMA_array_remove($path, $_SESSION[$this->id]); } else { PMA_array_write($path, $_SESSION[$this->id], $value); diff --git a/libraries/user_preferences.inc.php b/libraries/user_preferences.inc.php index 5e200c960..e1dee2b66 100644 --- a/libraries/user_preferences.inc.php +++ b/libraries/user_preferences.inc.php @@ -39,7 +39,7 @@ foreach (array_keys($forms) as $formset) { 'active' => ($script_name == 'prefs_forms.php' && $formset == $form_param)); echo PMA_generate_html_tab($tab, array('form' => $formset)) . "\n"; } -echo ''; +echo '
'; // show "configuration saved" message and reload navigation frame if needed if (!empty($_GET['saved'])) {