Changeset 13439
- Timestamp:
- 11/15/07 15:06:24 (1 year ago)
- Files:
-
- trunk/midcom/midcom.core/midcom.php (modified) (2 diffs)
- trunk/midcom/midcom.core/midcom/config/midcom_config.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/midcom/midcom.core/midcom.php
r13318 r13439 47 47 define('MIDCOM_STATIC_URL', '/midcom-static'); 48 48 } 49 if (! defined('MIDCOM_CONFIG_FILE '))49 if (! defined('MIDCOM_CONFIG_FILE_BEFORE')) 50 50 { 51 define('MIDCOM_CONFIG_FILE', '/etc/midgard/midcom.conf'); 51 define('MIDCOM_CONFIG_FILE_BEFORE', '/etc/midgard/midcom.conf'); 52 } 53 if (! defined('MIDCOM_CONFIG_FILE_AFTER')) 54 { 55 define('MIDCOM_CONFIG_FILE_AFTER', '/etc/midgard/midcom-after.conf'); 52 56 } 53 57 … … 168 172 //$GLOBALS['midcom'] =& $_MIDCOM; 169 173 $_MIDCOM->initialize(); 174 175 if (file_exists(MIDCOM_CONFIG_FILE_AFTER)) 176 { 177 include(MIDCOM_CONFIG_FILE_AFTER); 178 } 170 179 ?> trunk/midcom/midcom.core/midcom/config/midcom_config.php
r13424 r13439 516 516 /* ----- Include the site config ----- */ 517 517 /* This should be replaced by $_MIDGARD constructs */ 518 if (file_exists(MIDCOM_CONFIG_FILE ))518 if (file_exists(MIDCOM_CONFIG_FILE_BEFORE)) 519 519 { 520 include(MIDCOM_CONFIG_FILE );520 include(MIDCOM_CONFIG_FILE_BEFORE); 521 521 } 522 522
