[phpwiki-checkins] CVS: phpwiki/lib userauth.php,1.8,1.9

[Geoffrey T. D. <da...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv23003/lib

Modified Files:
	userauth.php 
Log Message:
(WikiUser::getPreferences): More fixes to address PHP warnings.


Index: userauth.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/userauth.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** userauth.php	2001/08/09 16:21:44	1.8
--- userauth.php	2001/08/14 21:41:10	1.9
***************
*** 102,110 ****
  
        global $HTTP_COOKIE_VARS;
!       if (is_string($HTTP_COOKIE_VARS['WIKI_PREFS'])) {
! 	 $prefcookie = unserialize(fix_magic_quotes_gpc($HTTP_COOKIE_VARS['WIKI_PREFS']));
! 	 while (list($k, $v) = each($prefs))
! 	    if (!empty($prefcookie[$k]))
! 	       $prefs[$k] = $prefcookie[$k];
        }
  
--- 102,115 ----
  
        global $HTTP_COOKIE_VARS;
!       if (isset($HTTP_COOKIE_VARS['WIKI_PREFS'])) {
! 	 $prefcookie = $HTTP_COOKIE_VARS['WIKI_PREFS'];
! 	 if (is_string($prefcookie)) {
! 	    $prefcookie = unserialize(fix_magic_quotes_gpc($prefcookie));
! 	    if (is_array($prefcookie)) {
! 	       while (list($k, $v) = each($prefs))
! 		  if (!empty($prefcookie[$k]))
! 		     $prefs[$k] = $prefcookie[$k];
! 	    }
! 	 }
        }