diff options
| author | Florian Pritz <bluewind@server-speed.net> | 2011-04-10 10:39:31 +0200 |
|---|---|---|
| committer | Florian Pritz <bluewind@server-speed.net> | 2011-04-10 10:39:31 +0200 |
| commit | 1bdc9c8903eb2db33fdb8174d61e15100dfbbca8 (patch) | |
| tree | b0c645ad99e04f34817fc4e6385792111db42274 /system/core/Hooks.php | |
| parent | 413d0cdac49257089a0790f6ac92973a36a6b69f (diff) | |
update to CI 2.0.2
Signed-off-by: Florian Pritz <bluewind@server-speed.net>
Diffstat (limited to 'system/core/Hooks.php')
| -rwxr-xr-x | system/core/Hooks.php | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/system/core/Hooks.php b/system/core/Hooks.php index 75fd811b0..24fa1055b 100755 --- 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 (defined('ENVIRONMENT') AND is_file(APPPATH.'config/'.ENVIRONMENT.'/hooks'.EXT)) + { + include(APPPATH.'config/'.ENVIRONMENT.'/hooks'.EXT); + } + elseif (is_file(APPPATH.'config/hooks'.EXT)) + { + include(APPPATH.'config/hooks'.EXT); + } + if ( ! isset($hook) OR ! is_array($hook)) { |