xoops-svn

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

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

Revision: 11957
          http://sourceforge.net/p/xoops/svn/11957
Author:   rgriffith
Date:     2013-08-21 02:43:10 +0000 (Wed, 21 Aug 2013)
Log Message:
-----------
XoopsConnection now autoloads, remove require of class file

Modified Paths:
--------------
    XoopsCore/branches/2.6.x/2.6.0_doctrine/htdocs/class/database/databasefactory.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-21 02:40:27 UTC (rev 11956)
+++ XoopsCore/branches/2.6.x/2.6.0_doctrine/htdocs/class/database/databasefactory.php	2013-08-21 02:43:10 UTC (rev 11957)
@@ -40,7 +40,6 @@
         static $instance;
         if (!isset($instance)) {
             //New database connector
-            require_once XOOPS_ROOT_PATH . '/class/database/xoopsdatabase.php';
             $config = new \Doctrine\DBAL\Configuration();
             $connectionParams = array(
                 'dbname' => XOOPS_DB_NAME,

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

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

Revision: 11984
          http://sourceforge.net/p/xoops/svn/11984
Author:   rgriffith
Date:     2013-08-27 17:13:11 +0000 (Tue, 27 Aug 2013)
Log Message:
-----------
Bypass issues on connect

Empty parameters are causing errors. We need to address these, but this just bypasses so it works.

Modified Paths:
--------------
    XoopsCore/branches/2.6.x/2.6.0_doctrine/htdocs/class/database/databasefactory.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-27 14:20:37 UTC (rev 11983)
+++ XoopsCore/branches/2.6.x/2.6.0_doctrine/htdocs/class/database/databasefactory.php	2013-08-27 17:13:11 UTC (rev 11984)
@@ -1,5 +1,5 @@
 <?php
-/**
+/*
   You may not change or alter any portion of this comment or credits
   of supporting developers from this source code or any supporting source code
   which is considered copyrighted (c) material of the original comment or credit authors.
@@ -54,12 +54,12 @@
                 'user' => XOOPS_DB_USER,
                 'password' => XOOPS_DB_PASS,
                 'host' => XOOPS_DB_HOST,
-                'port' => '',
-                'unix_socket' => '',
+//                'port' => '',
+//                'unix_socket' => '',
                 'charset' => XOOPS_DB_CHARSET,
                 'driver' => 'pdo_mysql',
                 'wrapperClass' => 'XoopsConnection',
-                'driverOptions' => array('')
+//                'driverOptions' => array('')
             );
             $instance
                 = \Doctrine\DBAL\DriverManager::getConnection(