From: Geoffrey T. D. <da...@us...> - 2001-12-11 18:42:15
|
Update of /cvsroot/phpwiki/phpwiki/lib In directory usw-pr-cvs1:/tmp/cvs-serv32589/lib Modified Files: WikiUser.php Log Message: Fix MonsterCookie bug. (See http://phpwiki.sf.net/wiki/BadRequest.) Index: WikiUser.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/lib/WikiUser.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** WikiUser.php 2001/12/06 20:44:13 1.5 --- WikiUser.php 2001/12/11 18:42:12 1.6 *************** *** 201,213 **** } ! function _copy($object) { ! if (!is_object($object)) return false; - if (strtolower(get_class($object)) != 'wikiuser') - return false; ! $this->userid = $object->userid; ! $this->state = $object->state; ! $this->realm = $object->realm; return true; } --- 201,211 ---- } ! function _copy($saved) { ! if (!is_array($saved) || !isset($saved['state']) || !isset($saved['realm'])) return false; ! $this->userid = $saved['userid']; ! $this->state = $saved['state']; ! $this->realm = $saved['realm']; return true; } *************** *** 232,238 **** $req = &$this->_request; ! $req->setSessionVar('auth_state', $this); // FIXME: Disable restore from cookie (see note in WikiUser().) ! //$req->setCookieVar('WIKI_AUTH', $this); } } --- 230,240 ---- $req = &$this->_request; ! $saved = array('userid' => $this->userid, ! 'state' => $this->state, ! 'realm' => $this->realm); ! ! $req->setSessionVar('auth_state', $saved); // FIXME: Disable restore from cookie (see note in WikiUser().) ! //$req->setCookieVar('WIKI_AUTH', $saved); } } |