diff options
| author | Andrey Andreev <narf@devilix.net> | 2015-01-04 18:27:27 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2015-01-04 18:27:27 +0100 |
| commit | 67e080c2614c9647400bcbeaa16f44b21b916ea7 (patch) | |
| tree | b28fc52875270b823f81d8d2a2682f096ff5e861 | |
| parent | 1e5a9b18f0cbef5092b95378e34ad8e7eaf0c7e7 (diff) | |
| parent | 4be16041b2bd585d5715cb65e147241bbdff2106 (diff) | |
Merge pull request #3457 from vlakoff/hooks
Change order of hooks loading
| -rw-r--r-- | system/core/Hooks.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/system/core/Hooks.php b/system/core/Hooks.php index 57e4a99a6..4ec7698d7 100644 --- a/system/core/Hooks.php +++ b/system/core/Hooks.php @@ -99,14 +99,14 @@ class CI_Hooks { } // Grab the "hooks" definition file. - if (file_exists(APPPATH.'config/'.ENVIRONMENT.'/hooks.php')) + if (file_exists(APPPATH.'config/hooks.php')) { - include(APPPATH.'config/'.ENVIRONMENT.'/hooks.php'); + include(APPPATH.'config/hooks.php'); } - if (file_exists(APPPATH.'config/hooks.php')) + if (file_exists(APPPATH.'config/'.ENVIRONMENT.'/hooks.php')) { - include(APPPATH.'config/hooks.php'); + include(APPPATH.'config/'.ENVIRONMENT.'/hooks.php'); } // If there are no hooks, we're done. |