Changeset 208 for trunk/trax/vendor/trax

Show
Ignore:
Timestamp:
05/28/06 11:59:55 (6 years ago)
Author:
john
Message:

fixing test for new format

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • trunk/trax/vendor/trax/trax.php

    r204 r208  
    9393        } 
    9494         
    95         # Load databse settings 
    96         self::$database_settings = parse_ini_file(self::$config_path."/database.ini",true); 
    97       
     95        # Make sure database settings are cleared out 
     96        self::$database_settings = array(); 
     97        if(file_exists(self::$config_path."/database.ini")) { 
     98            # Load databse settings  
     99            self::$database_settings = parse_ini_file(self::$config_path."/database.ini",true); 
     100        } 
     101         
    98102        # Set the include_path 
    99103        ini_set("include_path", 
     
    110114        include_once("inflector.php"); 
    111115        include_once("active_record.php"); 
     116        include_once("action_controller.php"); 
    112117        include_once("action_view.php"); 
    113         include_once("action_controller.php"); 
    114118        include_once("action_mailer.php"); 
    115119        include_once("dispatcher.php");