Update the CI_Hooks class
diff --git a/system/core/Hooks.php b/system/core/Hooks.php
index aa62e68..9bcc23a 100644
--- a/system/core/Hooks.php
+++ b/system/core/Hooks.php
@@ -58,7 +58,7 @@
*
* @var array
*/
- public $class = array();
+ protected $_objects = array();
/**
* In progress flag
@@ -203,31 +203,29 @@
if ($class !== FALSE)
{
// The object is stored?
- if (isset($this->class[$class]) && method_exists($this->class[$class], $function))
+ if (isset($this->_objects[$class]))
{
- $this->class[$class]->$function($params);
+ if (method_exists($this->_objects[$class], $function))
+ {
+ $this->_objects[$class]->$function($params);
+ }
+ else
+ {
+ return $this->_in_progress = FALSE;
+ }
}
else
- {
+ {
class_exists($class, FALSE) OR require_once($filepath);
if ( ! class_exists($class, FALSE) OR ! method_exists($class, $function))
{
return $this->_in_progress = FALSE;
}
-
- // If the developer wants the object to be stored
- if (isset($data['store_object']) && $data['store_object'] === TRUE)
- {
- $this->class[$class] = new $class();
- $HOOK =& $this->class[$class];
- }
- else
- {
- $HOOK = new $class();
- }
-
- $HOOK->$function($params);
+
+ // Store the object and execute the method
+ $this->_objects[$class] = new $class();
+ $this->_objects[$class]->$function($params);
}
}
else
@@ -249,4 +247,4 @@
}
/* End of file Hooks.php */
-/* Location: ./system/core/Hooks.php */
+/* Location: ./system/core/Hooks.php */
\ No newline at end of file