Changeset 316 for trunk/trax/vendor/trax/trax.php

Timestamp:

07/08/09 02:35:59 (3 years ago)

Author:

john

Message:

bug fixes / updates

Files:

• trunk/trax/vendor/trax/trax.php (modified) (2 diffs)

trunk/trax/vendor/trax/trax.php

@@ -98 +98 @@
         ini_set("log_errors", "On");
         ini_set("error_log", self::$log_path."/".TRAX_ENV.".log");
-
+         
         if(TRAX_ENV == "development") {
             # Display errors to browser if in development mode for debugging
@@ -128 +128 @@
         include_once("router.php");
 
-        # Make sure database settings are cleared out
-        ActiveRecord::$database_settings = array();
+        self::load_active_record_connections_config();
+
+    }  
+    
+    function load_active_record_connections_config() {
+        # Make sure database settings are cleared out 
+        ActiveRecord::$database_settings = array();   
+        ActiveRecord::clear_all_connections();
         if(file_exists(self::$config_path."/database.ini")) {
             # Load databse settings 
-            ActiveRecord::$database_settings = parse_ini_file(self::$config_path."/database.ini", true);
+            ActiveRecord::$database_settings = parse_ini_file(self::$config_path."/database.ini", true); 
+            #error_log("db settings:".print_r(ActiveRecord::$database_settings, true));
         }
-        ActiveRecord::$environment = TRAX_ENV;
-
+        ActiveRecord::$environment = TRAX_ENV;        
     }