From 4be16041b2bd585d5715cb65e147241bbdff2106 Mon Sep 17 00:00:00 2001 From: vlakoff Date: Sun, 4 Jan 2015 17:16:20 +0100 Subject: Change order of hooks loading Let override hooks via environment-specific config. --- system/core/Hooks.php | 8 ++++---- 1 file 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. -- cgit v1.2.3-24-g4f1b