cvs: pear /LiveUser_Admin/Auth Common.php /LiveUser_Admin/Perm Simple.php

lsmith Wed Aug 17 08:06:01 2005 EDT Modified files: /pear/LiveUser_Admin/Auth Common.php /pear/LiveUser_Admin/Perm Simple.php Log: - pass the storage config array by ref after all http://cvs.php.net/diff.php/pear/LiveUser_Admin/Auth/Common.php?r1=1.15&r2=1.16&ty=u Index: pear/LiveUser_Admin/Auth/Common.php diff -u pear/LiveUser_Admin/Auth/Common.php:1.15 pear/LiveUser_Admin/Auth/Common.php:1.16 --- pear/LiveUser_Admin/Auth/Common.php:1.15 Sun Aug 14 04:30:17 2005 +++ pear/LiveUser_Admin/Auth/Common.php Wed Aug 17 08:06:01 2005 @@ -57,7 +57,7 @@ * @author Bjoern Kraus <krausbn@php.net> * @copyright 2002-2005 Markus Wolff * @license http://www.gnu.org/licenses/lgpl.txt - * @version CVS: $Id: Common.php,v 1.15 2005/08/14 08:30:17 lsmith Exp $ + * @version CVS: $Id: Common.php,v 1.16 2005/08/17 12:06:01 lsmith Exp $ * @link http://pear.php.net/LiveUser_Admin */ @@ -179,8 +179,9 @@ } } - $storage_conf = array($conf['type'] => &$conf['storage']); - $this->_storage = LiveUser::storageFactory($storage_conf, 'LiveUser_Admin_Auth_'); + $storageConf = array(); + $storageConf[$conf['type']] =& $conf['storage']; + $this->_storage = LiveUser::storageFactory($storageConf, 'LiveUser_Admin_Auth_'); if ($this->_storage === false) { $this->_stack->push(LIVEUSER_ADMIN_ERROR, 'exception', array('msg' => 'Could not instanciate storage container')); http://cvs.php.net/diff.php/pear/LiveUser_Admin/Perm/Simple.php?r1=1.61&r2=1.62&ty=u Index: pear/LiveUser_Admin/Perm/Simple.php diff -u pear/LiveUser_Admin/Perm/Simple.php:1.61 pear/LiveUser_Admin/Perm/Simple.php:1.62 --- pear/LiveUser_Admin/Perm/Simple.php:1.61 Sun Aug 14 04:30:18 2005 +++ pear/LiveUser_Admin/Perm/Simple.php Wed Aug 17 08:06:01 2005 @@ -57,7 +57,7 @@ * @author Bjoern Kraus <krausbn@php.net> * @copyright 2002-2005 Markus Wolff * @license http://www.gnu.org/licenses/lgpl.txt - * @version CVS: $Id: Simple.php,v 1.61 2005/08/14 08:30:18 lsmith Exp $ + * @version CVS: $Id: Simple.php,v 1.62 2005/08/17 12:06:01 lsmith Exp $ * @link http://pear.php.net/LiveUser_Admin */ @@ -145,8 +145,7 @@ } } - $storageConf = $conf['storage']; - $this->_storage = LiveUser::storageFactory($storageConf, 'LiveUser_Admin_Perm_'); + $this->_storage =& LiveUser::storageFactory($conf['storage'], 'LiveUser_Admin_Perm_'); if ($this->_storage === false) { $this->_stack->push(LIVEUSER_ADMIN_ERROR, 'exception', array('msg' => 'Could not instanciate storage container'));