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

Timestamp:

08/26/06 10:27:55 (6 years ago)

Author:

john

Message:

move database_settings[] and active_connections[] to AR out of Trax class to make AR more generic for standalone version

Files:

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

trunk/trax/vendor/trax/trax.php

@@ -48 +48 @@
         $vendor_path = null,
         $public_path = null,
-        $database_settings = array(), 
         $url_prefix = null,
         $views_extension = 'phtml',
         $path_seperator = ":", # default is Unix
-        $active_record_connections = array(),
         $current_controller_path = null,
         $current_controller_name = null,
@@ -92 +90 @@
             ini_set("display_errors", "Off");
         }
-        
-        # Make sure database settings are cleared out
-        self::$database_settings = array();
-        if(file_exists(self::$config_path."/database.ini")) {
-            # Load databse settings 
-            self::$database_settings = parse_ini_file(self::$config_path."/database.ini",true);
-        }
-        
+                
         # Set the include_path
         ini_set("include_path",
@@ -119 +110 @@
         include_once("dispatcher.php");
         include_once("router.php");
+
+        # Make sure database settings are cleared out
+        ActiveRecord::$database_settings = array();
+        if(file_exists(self::$config_path."/database.ini")) {
+            # Load databse settings 
+            ActiveRecord::$database_settings = parse_ini_file(self::$config_path."/database.ini", true);
+        }
                    
     }