[xoops-svn] SF.net SVN: xoops-svn:[11980] XoopsCore/branches/2.6.x/2.6.0_doctrine/ htdocs/class/database

[<red...@us...>]

Revision: 11980
          http://sourceforge.net/p/xoops/svn/11980
Author:   redheadedrod
Date:     2013-08-25 22:26:28 +0000 (Sun, 25 Aug 2013)
Log Message:
-----------
Fixed missed typos.

Modified Paths:
--------------
    XoopsCore/branches/2.6.x/2.6.0_doctrine/htdocs/class/database/databasefactory.php
    XoopsCore/branches/2.6.x/2.6.0_doctrine/htdocs/class/database/mysqldatabase.php

Modified: XoopsCore/branches/2.6.x/2.6.0_doctrine/htdocs/class/database/databasefactory.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_doctrine/htdocs/class/database/databasefactory.php	2013-08-25 20:45:24 UTC (rev 11979)
+++ XoopsCore/branches/2.6.x/2.6.0_doctrine/htdocs/class/database/databasefactory.php	2013-08-25 22:26:28 UTC (rev 11980)
@@ -75,17 +75,14 @@
                     $class = 'Xoops' . ucfirst(XOOPS_DB_TYPE) . 'DatabaseProxy';
                 }
                 $xoopsPreload = XoopsPreload::getInstance();
-                $xoopsPreload->triggerEvent(
-                    'core.class.database.databasefactory.connection',
-                    array(&$class)
-                );
+                $xoopsPreload->triggerEvent('core.class.database.databasefactory.connection', array(&$class));
                 $xoopsDB = new $class();
                 $xoopsDB->setPrefix(XOOPS_DB_PREFIX);
                 $xoopsDB->conn = $instance;
             } else {
                 $xoopsDB = null;
                 $xoopsPreload = XoopsPreload::getInstance();
-                trigger_error('notrace:Unable to connect to database', E_USER_ERROR);
+                $xoopsPreload->trigger_error('notrace:Unable to connect to database', E_USER_ERROR);
             }
         }
         return $instance;

Modified: XoopsCore/branches/2.6.x/2.6.0_doctrine/htdocs/class/database/mysqldatabase.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_doctrine/htdocs/class/database/mysqldatabase.php	2013-08-25 20:45:24 UTC (rev 11979)
+++ XoopsCore/branches/2.6.x/2.6.0_doctrine/htdocs/class/database/mysqldatabase.php	2013-08-25 22:26:28 UTC (rev 11980)
@@ -71,8 +71,8 @@
      */
     public function connect($selectdb = true)
     {
-        $this->_connect = (is_object($this->conn));
-        $this->_selectdb = $selectdb;
+        $this->connect = (is_object($this->conn));
+        $this->selectdb = $selectdb;
         $this->allowWebChanges = ($_SERVER['REQUEST_METHOD'] != 'GET');
         return $this->connect;
     }