[xoops-svn] SF.net SVN: xoops-svn:[11928] XoopsCore/branches/2.6.x/2.6.0/htdocs/ xoops_lib/Xoops.php

[<rgr...@us...>]

Revision: 11928
          http://sourceforge.net/p/xoops/svn/11928
Author:   rgriffith
Date:     2013-08-16 03:02:06 +0000 (Fri, 16 Aug 2013)
Log Message:
-----------
Fix Strict error -  Only variables should be passed by reference

Modified Paths:
--------------
    XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops.php

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops.php	2013-08-16 02:58:42 UTC (rev 11927)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops.php	2013-08-16 03:02:06 UTC (rev 11928)
@@ -114,6 +114,11 @@
     public $isAdminSide = false;
 
     /**
+     * @var object
+     */
+    private $_db;
+
+    /**
      * Actual Xoops OS
      */
     private function __construct()
@@ -127,6 +132,8 @@
         $this->paths['media'] = array(XOOPS_ROOT_PATH . '/media', XOOPS_URL . '/media');
 
         $this->pathTranslation();
+
+        $this->_db = $this->db();
     }
 
     /**
@@ -776,7 +783,7 @@
         if (!isset($this->_kernelHandlers[$name])) {
             $class = 'Xoops' . ucfirst($name) . 'Handler';
             if (class_exists($class)) {
-                $this->_kernelHandlers[$name] = new $class($this->db());
+                $this->_kernelHandlers[$name] = new $class($this->_db);
             }
         }
         if (!isset($this->_kernelHandlers[$name])) {
@@ -815,7 +822,7 @@
             }
             $class = ucfirst(strtolower($module_dir)) . ucfirst($name) . 'Handler';
             if (class_exists($class)) {
-                $this->_moduleHandlers[$module_dir][$name] = new $class($this->db());
+                $this->_moduleHandlers[$module_dir][$name] = new $class($this->_db);
             }
         }
         if (!isset($this->_moduleHandlers[$module_dir][$name])) {
@@ -1818,4 +1825,4 @@
         error_reporting(0);
         $this->preload()->triggerEvent('core.disableerrorreporting');
     }
-}
\ No newline at end of file
+}