diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-04-25 11:46:44 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-04-25 11:46:44 +0200 |
| commit | 87899b0e140400e23341ea1286d50e330132be90 (patch) | |
| tree | 4c554fa2b949a12de2c7f33f3bf0b714c900e949 /phpBB/phpbb | |
| parent | 01e2d7c26c9974405c073d43ecd12614aca6faa5 (diff) | |
| download | forums-87899b0e140400e23341ea1286d50e330132be90.tar forums-87899b0e140400e23341ea1286d50e330132be90.tar.gz forums-87899b0e140400e23341ea1286d50e330132be90.tar.bz2 forums-87899b0e140400e23341ea1286d50e330132be90.tar.xz forums-87899b0e140400e23341ea1286d50e330132be90.zip | |
[ticket/12273] Update existing events
PHPBB3-12273
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/log/log.php | 28 | ||||
| -rw-r--r-- | phpBB/phpbb/user.php | 11 |
2 files changed, 33 insertions, 6 deletions
diff --git a/phpBB/phpbb/log/log.php b/phpBB/phpbb/log/log.php index b0aa637002..ea04344c59 100644 --- a/phpBB/phpbb/log/log.php +++ b/phpBB/phpbb/log/log.php @@ -307,7 +307,15 @@ class log implements \phpbb\log\log_interface * we won't add the entry to the database. * @since 3.1-A1 */ - $vars = array('mode', 'user_id', 'log_ip', 'log_operation', 'log_time', 'additional_data', 'sql_ary'); + $vars = array( + 'mode', + 'user_id', + 'log_ip', + 'log_operation', + 'log_time', + 'additional_data', + 'sql_ary', + ); extract($this->dispatcher->trigger_event('core.add_log', compact($vars))); // We didn't find a log_type, so we don't save it in the database. @@ -405,9 +413,21 @@ class log implements \phpbb\log\log_interface * e.g.: 'AND l.forum_id = 1' * @since 3.1-A1 */ - $vars = array('mode', 'count_logs', 'limit', 'offset', 'forum_id', 'topic_id'); - $vars = array_merge($vars, array('user_id', 'log_time', 'sort_by', 'keywords')); - $vars = array_merge($vars, array('profile_url', 'log_type', 'sql_additional')); + $vars = array( + 'mode', + 'count_logs', + 'limit', + 'offset', + 'forum_id', + 'topic_id', + 'user_id', + 'log_time', + 'sort_by', + 'keywords', + 'profile_url', + 'log_type', + 'sql_additional', + ); extract($this->dispatcher->trigger_event('core.get_logs_modify_type', compact($vars))); if ($log_type === false) diff --git a/phpBB/phpbb/user.php b/phpBB/phpbb/user.php index 1f65b63522..417cc71fd3 100644 --- a/phpBB/phpbb/user.php +++ b/phpBB/phpbb/user.php @@ -145,8 +145,15 @@ class user extends \phpbb\session * @var mixed style_id Style we are going to display * @since 3.1-A1 */ - $vars = array('user_data', 'user_lang_name', 'user_date_format', 'lang_set'); - $vars = array_merge($vars, array('user_timezone', 'lang_set_ext', 'style_id')); + $vars = array( + 'user_data', + 'user_lang_name', + 'user_date_format', + 'user_timezone', + 'lang_set', + 'lang_set_ext', + 'style_id', + ); extract($phpbb_dispatcher->trigger_event('core.user_setup', compact($vars))); $this->data = $user_data; |