summaryrefslogtreecommitdiffstats
path: root/system/core
diff options
context:
space:
mode:
Diffstat (limited to 'system/core')
-rw-r--r--system/core/Hooks.php10
-rw-r--r--system/core/Loader.php10
-rw-r--r--system/core/Output.php11
-rw-r--r--system/core/Router.php10
4 files changed, 37 insertions, 4 deletions
diff --git a/system/core/Hooks.php b/system/core/Hooks.php
index 75fd811b0..e4f8cfa53 100644
--- a/system/core/Hooks.php
+++ b/system/core/Hooks.php
@@ -65,7 +65,15 @@ class CI_Hooks {
// Grab the "hooks" definition file.
// If there are no hooks, we're done.
- @include(APPPATH.'config/hooks'.EXT);
+ if (file_exists(APPPATH.'config/'.ENVIRONMENT.'/hooks'.EXT))
+ {
+ @include(APPPATH.'config/'.ENVIRONMENT.'/hooks'.EXT);
+ }
+ else
+ {
+ @include(APPPATH.'config/hooks'.EXT);
+ }
+
if ( ! isset($hook) OR ! is_array($hook))
{
diff --git a/system/core/Loader.php b/system/core/Loader.php
index 7003318ee..75c09435d 100644
--- a/system/core/Loader.php
+++ b/system/core/Loader.php
@@ -975,7 +975,15 @@ class CI_Loader {
*/
function _ci_autoloader()
{
- include_once(APPPATH.'config/autoload'.EXT);
+ if (file_exists(APPPATH.'config/'.ENVIRONMENT.'/autoload'.EXT))
+ {
+ include_once(APPPATH.'config/'.ENVIRONMENT.'/autoload'.EXT);
+ }
+ else
+ {
+ include_once(APPPATH.'config/autoload'.EXT);
+ }
+
if ( ! isset($autoload))
{
diff --git a/system/core/Output.php b/system/core/Output.php
index 6644b3bff..82c821524 100644
--- a/system/core/Output.php
+++ b/system/core/Output.php
@@ -43,7 +43,16 @@ class CI_Output {
$this->_zlib_oc = @ini_get('zlib.output_compression');
// Get mime types for later
- include APPPATH.'config/mimes'.EXT;
+ if (file_exists(APPPATH.'config/'.ENVIRONMENT.'/mimes'.EXT))
+ {
+ include APPPATH.'config/'.ENVIRONMENT.'/mimes'.EXT;
+ }
+ else
+ {
+ include APPPATH.'config/mimes'.EXT;
+ }
+
+
$this->mime_types = $mimes;
log_message('debug', "Output Class Initialized");
diff --git a/system/core/Router.php b/system/core/Router.php
index 6893e6e92..005e81748 100644
--- a/system/core/Router.php
+++ b/system/core/Router.php
@@ -87,7 +87,15 @@ class CI_Router {
}
// Load the routes.php file.
- @include(APPPATH.'config/routes'.EXT);
+
+ if (file_exists(APPPATH.'config/'.ENVIRONMENT.'/routes'.EXT))
+ {
+ @include(APPPATH.'config/'.ENVIRONMENT.'/routes'.EXT);
+ }
+ else
+ {
+ @include(APPPATH.'config/routes'.EXT);
+ }
$this->routes = ( ! isset($route) OR ! is_array($route)) ? array() : $route;
unset($route);