[phpwiki-checkins] CVS: phpwiki/lib WikiUserNew.php,1.131,1.132

[Reini U. <ru...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5165

Modified Files:
	WikiUserNew.php 
Log Message:
fix for fatal error on empty pref value (sign out). Thanks to Jim Ford and Joel Schaubert. rename hash for php-5.1

Index: WikiUserNew.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/WikiUserNew.php,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -2 -b -p -d -r1.131 -r1.132
--- WikiUserNew.php	12 Oct 2005 06:16:48 -0000	1.131
+++ WikiUserNew.php	4 Mar 2006 13:19:12 -0000	1.132
@@ -1840,5 +1840,8 @@ class UserPreferences
            return true;
         */
-        if (!isset($pref->{$value}) or $pref->{$value} != $pref->default_value) {
+        if ((!$value and $pref->default_value)
+            or ($value and !isset($pref->$value))
+            or ($value and ($pref->$value != $pref->default_value)))
+        {
             if ($name == 'emailVerified') $newvalue = $value;
             else $newvalue = $pref->sanify($value);
@@ -2006,5 +2009,5 @@ class UserPreferences
 
     function hash () {
-        return hash($this->_prefs);
+        return wikihash($this->_prefs);
     }
 }
@@ -2079,4 +2082,7 @@ extends UserPreferences
 
 // $Log$
+// Revision 1.132  2006/03/04 13:19:12  rurban
+// fix for fatal error on empty pref value (sign out). Thanks to Jim Ford and Joel Schaubert. rename hash for php-5.1
+//
 // Revision 1.131  2005/10/12 06:16:48  rurban
 // add new _insert statement