Changeset 7014

Timestamp:

11/18/08 17:25:04 (7 weeks ago)

Author:

inureyes

Message:

refs #777

• 일단 돌아가게 만들기 (2)
  

Location:

trunk

Files:

• dispatcher.php (modified) (1 diff)
• library/include.php (modified) (1 diff)
• library/initialize.php (modified) (1 diff)
• library/loader.php (modified) (1 diff)

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/include.php

@@ -49 +49 @@
     'cache/PageCache');
 foreach($__coreLibrary as $lib) {
-    require ROOT .'/library/'.$lib.'.php';
+    require_once ROOT .'/library/'.$lib.'.php';
 } 
 /***** Loading code pieces *****/

trunk/library/initialize.php

@@ -15 +15 @@
 }
 $database['utf8'] = (POD::charset() == 'utf8') ? true : false;
-
 /**
       Memcache module bind (if possible)

trunk/library/loader.php

@@ -57 +57 @@
         global $service;
         $name = ucfirst($name);
+        $config = Config::getInstance();
         if(empty(self::$relation)) {self::register();}
         if (in_array($name,array('DBQuery'))) {
-            if (!isset($service['dbms'])) $service['dbms'] = 'mysql';
-            require_once(ROOT . "/library/data/".$service['dbms']."/Adapter.php");
-            require_once(ROOT . "/library/data/Database.php");
+            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");