summaryrefslogtreecommitdiffstats
path: root/system/core
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2014-01-07 17:08:26 +0100
committerAndrey Andreev <narf@devilix.net>2014-01-07 17:08:26 +0100
commitda8c7a5bb92b928c19918632d8cb8a06d0ea747d (patch)
tree61f89dd35e027b8f3619713e802d4fe78fd538cb /system/core
parentd98c4a3557aa87c02f262f0f7495691f1bc174f0 (diff)
Fix a few bugs in CI_Hook (based on PR #2762)
Diffstat (limited to 'system/core')
-rw-r--r--system/core/Hooks.php12
1 files changed, 8 insertions, 4 deletions
diff --git a/system/core/Hooks.php b/system/core/Hooks.php
index b3b111991..aa7ac1e5d 100644
--- a/system/core/Hooks.php
+++ b/system/core/Hooks.php
@@ -184,7 +184,7 @@ class CI_Hooks {
$function = empty($data['function']) ? FALSE : $data['function'];
$params = isset($data['params']) ? $data['params'] : '';
- if ($class === FALSE && $function === FALSE)
+ if (empty($function))
{
return FALSE;
}
@@ -195,9 +195,11 @@ class CI_Hooks {
// Call the requested class and/or function
if ($class !== FALSE)
{
- if ( ! class_exists($class, FALSE))
+ class_exists($class, FALSE) OR require_once($filepath);
+
+ if ( ! class_exists($class, FALSE) OR ! method_exists($class, $function))
{
- require($filepath);
+ return $this->_in_progress = FALSE;
}
$HOOK = new $class();
@@ -205,9 +207,11 @@ class CI_Hooks {
}
else
{
+ function_exists($function) OR require_once($filepath);
+
if ( ! function_exists($function))
{
- require($filepath);
+ return $this->_in_progress = FALSE;
}
$function($params);