mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-03 21:27:25 +02:00
Code Issues Releases Wiki Activity

Fixes #4079 - Corrected multiple event includes conflict.

Browse Source
This commit is contained in:
Cameron
2020-03-07 10:00:12 -08:00
parent bb16213b85
commit b4b649eeb6
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
e107_handlers/event_class.php
View File

@@ -140,13 +140,15 @@ class e107_event
*/ */
function register($eventname, $function, $include='') function register($eventname, $function, $include='')
{ {
$this->includes[$eventname] = array();
if(!isset($this->functions[$eventname]) || !in_array($function, $this->functions[$eventname])) if(!isset($this->functions[$eventname]) || !in_array($function, $this->functions[$eventname]))
{ {
if (!empty($include)) if (!empty($include))
{ {
$this->includes[$eventname][] = $include; $this->includes[$eventname][] = $include;
} }
$this->functions[$eventname][] = $function; $this->functions[$eventname][] = $function;
} }
} }
@@ -155,11 +157,12 @@ class e107_event
function debug() function debug()
{ {
echo "<h3>Event Functions</h3>"; $text = "<h3>Event Functions</h3>";
print_a($this->functions); $text .= print_a($this->functions,true);
echo "<h3>Event Includes</h3>"; $text .= "<h3>Event Includes</h3>";
print_a($this->includes); $text .= print_a($this->includes,true);
return $text;
} }
@@ -182,6 +185,10 @@ class e107_event
} }
} }
}*/ }*/
// echo ($this->debug());
if (isset($this->functions[$eventname])) if (isset($this->functions[$eventname]))
{ {
foreach($this->functions[$eventname] as $i => $evt_func) foreach($this->functions[$eventname] as $i => $evt_func)
@@ -190,9 +197,12 @@ class e107_event
if(isset($this->includes[$eventname][$i])) //no checks if(isset($this->includes[$eventname][$i])) //no checks
{ {
$location = $this->includes[$eventname][$i]; $location = $this->includes[$eventname][$i];
e107_include_once($location); e107_include_once($location);
unset($this->includes[$eventname][$i]); unset($this->includes[$eventname][$i]);
} }
if(is_array($evt_func)) //class, method if(is_array($evt_func)) //class, method
{ {
$class = $evt_func[0]; $class = $evt_func[0];