mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 06:08:52 +00:00
[ticket/12262] Also find vars array when it's defined in the trigger_event()
PHPBB3-12262
This commit is contained in:
parent
296af6c679
commit
e1d5702853
1 changed files with 22 additions and 11 deletions
|
@ -117,6 +117,16 @@ function check_for_events($phpbb_root_path, $file)
|
||||||
$event_name = substr($event_name, $found_trigger_event + strlen("phpbb_dispatcher->trigger_event('"));
|
$event_name = substr($event_name, $found_trigger_event + strlen("phpbb_dispatcher->trigger_event('"));
|
||||||
$event_name = substr($event_name, 0, strpos($event_name, "'"));
|
$event_name = substr($event_name, 0, strpos($event_name, "'"));
|
||||||
|
|
||||||
|
$current_line = trim($lines[$event_line]);
|
||||||
|
$arguments = array();
|
||||||
|
if (($found_inline_array = strpos($current_line, "', compact(array('")) !== false)
|
||||||
|
{
|
||||||
|
$varsarray = substr($current_line, $found_inline_array + strlen("', compact(array('"), -6);
|
||||||
|
$arguments = explode("', '", $varsarray);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (empty($arguments))
|
||||||
|
{
|
||||||
// Find $vars array lines
|
// Find $vars array lines
|
||||||
$find_varsarray_line = 1;
|
$find_varsarray_line = 1;
|
||||||
while (strpos($lines[$event_line - $find_varsarray_line], "vars = array('") === false)
|
while (strpos($lines[$event_line - $find_varsarray_line], "vars = array('") === false)
|
||||||
|
@ -130,6 +140,7 @@ function check_for_events($phpbb_root_path, $file)
|
||||||
}
|
}
|
||||||
$varsarray = substr(trim($lines[$event_line - $find_varsarray_line]), strlen("\$vars = array('"), -3);
|
$varsarray = substr(trim($lines[$event_line - $find_varsarray_line]), strlen("\$vars = array('"), -3);
|
||||||
$arguments = explode("', '", $varsarray);
|
$arguments = explode("', '", $varsarray);
|
||||||
|
}
|
||||||
|
|
||||||
// Validate $vars array with @var
|
// Validate $vars array with @var
|
||||||
$find_vars_line = 3;
|
$find_vars_line = 3;
|
||||||
|
|
Loading…
Add table
Reference in a new issue