Changeset 462

Timestamp:

01/13/08 16:33:04 (12 months ago)

Author:

padams

Message:

- fixed bug where config file wasnt being loaded early enough.

Location:

trunk

Files:

• owa_caller.php (modified) (3 diffs)
• owa_php.php (modified) (1 diff)

trunk/owa_caller.php

@@ -76 +76 @@
                 $this->start_time = owa_lib::microtime_float();
                 
+                $file = OWA_BASE_DIR.DIRECTORY_SEPARATOR.'conf'.DIRECTORY_SEPARATOR.'owa-config.php';
+                
+                if (file_exists($file)):
+                        $config_file_exists = true;
+                        include($file);
+                else:
+                        $this->e->debug("I can't find your configuration file...assuming that you didn't create one.");
+                endif;
+                
                 // Parent Constructor. Sets default config and error logger
                 $this->owa_base();
@@ -105 +114 @@
                 /* APPLY CONFIGURATION FILE OVERRIDES */
                 
-                $file = OWA_BASE_DIR.DIRECTORY_SEPARATOR.'conf'.DIRECTORY_SEPARATOR.'owa-config.php';
-                
-                if (file_exists($file)):
-                        
-                        include ($file);
+                
+                if ($config_file_exists == true):
                         
                         /* OBJECT CACHING */
@@ -132 +138 @@
                         endif;
                         
-                else:
-                        $this->e->debug("I can't find your configuration file...assuming that you didn't create one.");
-                endif;
-                
-                                        
+                endif;
+                        
+                $this->e->debug('PURL: '.OWA_PUBLIC_URL);                       
                 /* APPLY DATABASE CONFIGURATION */
                 

trunk/owa_php.php

@@ -46 +46 @@
         }
         
-        function __construct($config = null) {
         
-                return parent::__construct($config);
+        /*
+function __construct($config = null) {
+                //return;
+                return $this->owa_caller($config);
         
         }
+
+*/
 
 }