- php forces pass by ref anyways .. but the way things were things br…

…oke with an error logger git-svn-id: http://svn.php.net/repository/pear/packages/LiveUser/trunk@218675 c90b9560-bf6c-de11-be94-00142212c4b1
pear · Aug 22, 2006 · 5b995d1 · 5b995d1
1 parent 6018dfd
commit 5b995d1
Showing 1 changed file with 2 additions and 10 deletions.
diff --git a/LiveUser.php b/LiveUser.php
@@ -731,24 +731,16 @@ function classExists($classname)
      * @access public
      * @see    LiveUser::factory
      */
-    function readConfig(&$conf)
+    function readConfig($conf)
     {
-        // probably a futile attempt at working out reference issues in arrays
-        $options = $conf;
-
-        if (array_key_exists('debug', $conf) && is_object($conf['debug'])) {
-            $options['debug'] = true;
-        }
         if (array_key_exists('authContainers', $conf)) {
             $this->_authContainers =& $conf['authContainers'];
-            unset($options['authContainers']);
         }
         if (array_key_exists('permContainer', $conf)) {
             $this->_permContainer =& $conf['permContainer'];
-            unset($options['permContainer']);
         }
 
-        $this->_options = LiveUser::arrayMergeClobber($this->_options, $options);
+        $this->_options = LiveUser::arrayMergeClobber($this->_options, $conf);
         if (array_key_exists('cookie', $this->_options) && $this->_options['cookie']) {
             $cookie_default = array(
                 'name'     => 'ludata',