diff options
| author | Andrey Andreev <narf@devilix.net> | 2014-10-05 23:04:19 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2014-10-05 23:04:19 +0200 |
| commit | 4a485a73d64a8bebc7625aabc5fdc361d5e7dc56 (patch) | |
| tree | cb18690c4de1c6ca008227260f9dd0cd2b9279d2 /system/core/Hooks.php | |
| parent | 39ec29585b7cdca7edc1a0757c913a13a2ee4f85 (diff) | |
| parent | d444d445ed0458a352ecb9ff79ffd158677ee805 (diff) | |
Merge branch 'develop' into feature/session
Diffstat (limited to 'system/core/Hooks.php')
| -rw-r--r-- | system/core/Hooks.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/core/Hooks.php b/system/core/Hooks.php index fd1a2ba11..26ced0894 100644 --- a/system/core/Hooks.php +++ b/system/core/Hooks.php @@ -127,7 +127,7 @@ class CI_Hooks { return FALSE; } - if (is_array($this->hooks[$which])) + if (is_array($this->hooks[$which]) && ! isset($this->hooks[$which]['function'])) { foreach ($this->hooks[$which] as $val) { |