diff options
| author | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-12-26 18:59:30 +0100 |
|---|---|---|
| committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-12-26 18:59:30 +0100 |
| commit | 358ffec0a6b2a1fcc55e09623619126671d3e65f (patch) | |
| tree | 6888d3f0a73500575db564cb4e5dbe5b828e4589 /system/core/Hooks.php | |
| parent | d9f0a1496af1dfca7c317028708b2cd1e5727cea (diff) | |
| parent | 5c1aa631c5f5ec2f6b75ba1158178418e50ba11a (diff) | |
Merge pull request #826 from EllisLab/feature/abstract-config-load
Abstracting the loading of files in the config directory depending on environments
Diffstat (limited to 'system/core/Hooks.php')
| -rwxr-xr-x | system/core/Hooks.php | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/system/core/Hooks.php b/system/core/Hooks.php index aa251a389..6a36ce963 100755 --- a/system/core/Hooks.php +++ b/system/core/Hooks.php @@ -91,16 +91,7 @@ class CI_Hooks { // Grab the "hooks" definition file. // If there are no hooks, we're done. - - if (defined('ENVIRONMENT') AND is_file(APPPATH.'config/'.ENVIRONMENT.'/hooks.php')) - { - include(APPPATH.'config/'.ENVIRONMENT.'/hooks.php'); - } - elseif (is_file(APPPATH.'config/hooks.php')) - { - include(APPPATH.'config/hooks.php'); - } - + load_environ_config('hooks'); if ( ! isset($hook) OR ! is_array($hook)) { |