diff options
| author | philsturgeon <devnull@localhost> | 2011-06-15 17:00:03 +0200 |
|---|---|---|
| committer | philsturgeon <devnull@localhost> | 2011-06-15 17:00:03 +0200 |
| commit | 0fe54dbaf89a8337d27b9203f74891cf1a799715 (patch) | |
| tree | ce168b3c24788e5a4a31e0cc65b64f54e25ee8a2 /system/core/Hooks.php | |
| parent | 3a43c7adae7737d68a0eeca663cc2dd3fc5b0cf3 (diff) | |
| parent | 3ef65bd7491f847fecdab1acc9687f0e90eee09b (diff) | |
Merged Alex Bilbies MSSQL changes.
Diffstat (limited to 'system/core/Hooks.php')
| -rw-r--r-- | system/core/Hooks.php | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/system/core/Hooks.php b/system/core/Hooks.php index 75fd811b0..ffb3258d8 100644 --- a/system/core/Hooks.php +++ b/system/core/Hooks.php @@ -1,4 +1,4 @@ -<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); +<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); /** * CodeIgniter * @@ -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.php')) + { + include(APPPATH.'config/'.ENVIRONMENT.'/hooks.php'); + } + elseif (is_file(APPPATH.'config/hooks.php')) + { + include(APPPATH.'config/hooks.php'); + } + if ( ! isset($hook) OR ! is_array($hook)) { |