Changeset 7015

Timestamp:

11/18/08 17:37:18 (7 weeks ago)

Author:

inureyes

Message:

refs #777

• DB 연결시 연결 방법을 mysqli 를 강제하지 않도록 함.
  
• 무한루프 가능성 지움.
  

Location:

trunk

Files:

• dispatcher.php (modified) (1 diff)
• library/loader.php (modified) (1 diff)
• library/settings.php (modified) (2 diffs)

trunk/dispatcher.php

@@ -19 +19 @@
 /// Initialize class loader.
 include(ROOT.'/library/base.php');
-include(ROOT.'/library/loader.php');
 include(ROOT.'/library/settings.php');
 include(ROOT.'/library/context.php');
+include(ROOT.'/library/loader.php');
 $config = Config::getInstance();
 

trunk/library/loader.php

@@ -61 +61 @@
         if (in_array($name,array('DBQuery'))) {
             require_once(ROOT . "/library/data/".$config->backend_name."/Adapter.php");
-            require_once(ROOT . "/library/database.php");
         } else if(self::$relation[$name] == 'session' && isset($service['memcached']) && $service['memcached'] == true) {
             require_once(ROOT . "/library/session/Session_Memcached.php");

trunk/library/settings.php

@@ -23 +23 @@
         // Include installation configuration.
         $service['session_cookie_path'] = '/';
-        if(!defined('__TEXTCUBE_SETUP__')) @include ROOT . '/config.php';
+        if(!defined('__TEXTCUBE_SETUP__')) @include_once ROOT . '/config.php';
         
         // Set resource path.
@@ -36 +36 @@
         
         // Database setting.
-        if(isset($service['dbms'])) {
-            if($service['dbms'] == 'mysql' && class_exists('mysqli')) $service['dbms'] = 'mysqli';
-        }
+//      if(isset($service['dbms'])) {
+//          if($service['dbms'] == 'mysql' && class_exists('mysqli')) $service['dbms'] = 'mysqli';
+//      }
         
         // Debug mode configuration.