[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-2074-g6fb8505

[Michal Čihař]

The branch, master has been updated
       via  6fb8505721429ca17996d8264403f333591b9cb2 (commit)
      from  e13b41a555cc556362ce56e61cfa53cd2dbda5e7 (commit)


- Log -----------------------------------------------------------------
commit 6fb8505721429ca17996d8264403f333591b9cb2
Author: Michal Čihař <mcihar at novell.com>
Date:   Wed Feb 9 13:55:25 2011 +0100

    Use correct type when storing preferences.
    
    We should not use the value, but the key. Value stores descriptions,
    while key is actually the thing stored in settings.

-----------------------------------------------------------------------

Summary of changes:
 libraries/config/FormDisplay.class.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libraries/config/FormDisplay.class.php b/libraries/config/FormDisplay.class.php
index 41c421f..9e84075 100644
--- a/libraries/config/FormDisplay.class.php
+++ b/libraries/config/FormDisplay.class.php
@@ -468,7 +468,7 @@ class FormDisplay
             // (allows to skip 0 == 'string' equalling to true) or identity (for string-string)
             if (($vk == $value && !(is_numeric($value_cmp) xor is_numeric($vk)))
                     || $vk === $value) {
-                settype($value, gettype($v));
+                settype($value, gettype($vk));
                 return true;
             }
         }


hooks/post-receive
-- 
phpMyAdmin