summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
Diffstat (limited to 'system')
-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
-rw-r--r--system/helpers/download_helper.php9
-rw-r--r--system/helpers/file_helper.php11
-rw-r--r--system/helpers/html_helper.php11
-rw-r--r--system/helpers/smiley_helper.php13
-rw-r--r--system/helpers/text_helper.php11
-rw-r--r--system/libraries/Upload.php11
-rw-r--r--system/libraries/User_agent.php11
11 files changed, 104 insertions, 14 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);
diff --git a/system/helpers/download_helper.php b/system/helpers/download_helper.php
index 6cecd0d11..a851e3c42 100644
--- a/system/helpers/download_helper.php
+++ b/system/helpers/download_helper.php
@@ -58,7 +58,14 @@ if ( ! function_exists('force_download'))
$extension = end($x);
// Load the mime types
- @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);
+ }
// Set a default mime if we can't find it
if ( ! isset($mimes[$extension]))
diff --git a/system/helpers/file_helper.php b/system/helpers/file_helper.php
index 9518e4843..fb074e027 100644
--- a/system/helpers/file_helper.php
+++ b/system/helpers/file_helper.php
@@ -352,7 +352,16 @@ if ( ! function_exists('get_mime_by_extension'))
if ( ! is_array($mimes))
{
- if ( ! require_once(APPPATH.'config/mimes.php'))
+ if (file_exists(APPPATH.'config/'.ENVIRONMENT.'/mimes'.EXT))
+ {
+ @include(APPPATH.'config/'.ENVIRONMENT.'/mimes'.EXT);
+ }
+ else
+ {
+ @include(APPPATH.'config/mimes'.EXT);
+ }
+
+ if ( ! is_array($mimes))
{
return FALSE;
}
diff --git a/system/helpers/html_helper.php b/system/helpers/html_helper.php
index 68c6f5908..c94c88004 100644
--- a/system/helpers/html_helper.php
+++ b/system/helpers/html_helper.php
@@ -258,7 +258,16 @@ if ( ! function_exists('doctype'))
if ( ! is_array($_doctypes))
{
- if ( ! require_once(APPPATH.'config/doctypes.php'))
+ if (file_exists(APPPATH.'config/'.ENVIRONMENT.'/doctypes'.EXT))
+ {
+ @include(APPPATH.'config/'.ENVIRONMENT.'/doctypes'.EXT);
+ }
+ else
+ {
+ @include(APPPATH.'config/doctypes'.EXT);
+ }
+
+ if ( ! is_array($_doctypes))
{
return FALSE;
}
diff --git a/system/helpers/smiley_helper.php b/system/helpers/smiley_helper.php
index 463881f58..6c901515d 100644
--- a/system/helpers/smiley_helper.php
+++ b/system/helpers/smiley_helper.php
@@ -229,13 +229,20 @@ if ( ! function_exists('_get_smiley_array'))
{
function _get_smiley_array()
{
- if ( ! file_exists(APPPATH.'config/smileys'.EXT))
+ if ( ! file_exists(APPPATH.'config/smileys'.EXT) AND ! file_exists(APPPATH.'config/'.ENVIRONMENT.'/smileys'.EXT))
{
return FALSE;
}
- include(APPPATH.'config/smileys'.EXT);
-
+ if (file_exists(APPPATH.'config/'.ENVIRONMENT.'/smileys'.EXT))
+ {
+ include(APPPATH.'config/'.ENVIRONMENT.'/smileys'.EXT);
+ }
+ else
+ {
+ include(APPPATH.'config/smileys'.EXT);
+ }
+
if ( ! isset($smileys) OR ! is_array($smileys))
{
return FALSE;
diff --git a/system/helpers/text_helper.php b/system/helpers/text_helper.php
index 96afd4cee..197bcb14e 100644
--- a/system/helpers/text_helper.php
+++ b/system/helpers/text_helper.php
@@ -366,12 +366,19 @@ if ( ! function_exists('convert_accented_characters'))
{
function convert_accented_characters($str)
{
- if ( ! file_exists(APPPATH.'config/foreign_chars'.EXT))
+ if ( ! file_exists(APPPATH.'config/foreign_chars'.EXT) AND ! file_exists(APPPATH.'config/'.ENVIRONMENT.'/foreign_chars'.EXT))
{
return $str;
}
- include APPPATH.'config/foreign_chars'.EXT;
+ if (file_exists(APPPATH.'config/'.ENVIRONMENT.'/foreign_chars'.EXT))
+ {
+ include APPPATH.'config/'.ENVIRONMENT.'/foreign_chars'.EXT;
+ }
+ else
+ {
+ include APPPATH.'config/foreign_chars'.EXT;
+ }
if ( ! isset($foreign_characters))
{
diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php
index 2012fb302..24189f4b4 100644
--- a/system/libraries/Upload.php
+++ b/system/libraries/Upload.php
@@ -951,7 +951,16 @@ class CI_Upload {
if (count($this->mimes) == 0)
{
- if (@require(APPPATH.'config/mimes'.EXT))
+ if (file_exists(APPPATH.'config/'.ENVIRONMENT.'/mimes'.EXT))
+ {
+ $_mimes_path = APPPATH.'config/'.ENVIRONMENT.'/mimes'.EXT;
+ }
+ else
+ {
+ $_mimes_path = APPPATH.'config/mimes'.EXT;
+ }
+
+ if (@require($_mimes_path))
{
$this->mimes = $mimes;
unset($mimes);
diff --git a/system/libraries/User_agent.php b/system/libraries/User_agent.php
index 3774fc283..2690e174d 100644
--- a/system/libraries/User_agent.php
+++ b/system/libraries/User_agent.php
@@ -84,7 +84,16 @@ class CI_User_agent {
*/
private function _load_agent_file()
{
- if ( ! @include(APPPATH.'config/user_agents'.EXT))
+ if (file_exists(APPPATH.'config/'.ENVIRONMENT.'/user_agents'.EXT))
+ {
+ $_ua_path = APPPATH.'config/'.ENVIRONMENT.'/user_agents'.EXT;
+ }
+ else
+ {
+ $_ua_path = APPPATH.'config/user_agents'.EXT;
+ }
+
+ if ( ! @include($_ua_path))
{
return FALSE;
}
generated by cgit v1.2.3-24-g4f1b (git 2.32.0) at 2024-11-03 14:37:49 +0100