Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv1190/lib
Modified Files:
userauth.php
Log Message:
Fix for PHP warning: "argument passed to unserialize() is not an string".
Index: userauth.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/userauth.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** userauth.php 2001/07/20 17:40:12 1.7
--- userauth.php 2001/08/09 16:21:44 1.8
***************
*** 101,109 ****
'edit_area.height' => 22);
! $prefcookie = unserialize(fix_magic_quotes_gpc($GLOBALS['WIKI_PREFS']));
!
! while (list($k, $v) = each($prefs))
! if (!empty($prefcookie[$k]))
! $prefs[$k] = $prefcookie[$k];
// Some sanity checks. (FIXME: should move somewhere else)
--- 101,111 ----
'edit_area.height' => 22);
! 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];
! }
// Some sanity checks. (FIXME: should move somewhere else)
|
