diff options
| author | David King <imkingdavid@gmail.com> | 2012-08-20 20:45:09 -0400 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2012-08-20 20:45:09 -0400 |
| commit | 0ba755f1bdc6329be1e58f6392b67e125abfbff5 (patch) | |
| tree | 580382e03a42c2cdd1ae24d45bdfc385923881af /phpBB | |
| parent | e80e3809b9c1a2139817aa180aae87576570acaa (diff) | |
| download | forums-0ba755f1bdc6329be1e58f6392b67e125abfbff5.tar forums-0ba755f1bdc6329be1e58f6392b67e125abfbff5.tar.gz forums-0ba755f1bdc6329be1e58f6392b67e125abfbff5.tar.bz2 forums-0ba755f1bdc6329be1e58f6392b67e125abfbff5.tar.xz forums-0ba755f1bdc6329be1e58f6392b67e125abfbff5.zip | |
[feature/add_events] Rename core.append_sid_override to just core.append_sid
Also, I added the hook back in below the event for backwards compatibility.
PHPBB3-9550
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/functions.php | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 3c26337f91..404288083b 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2247,7 +2247,7 @@ function append_sid($url, $params = false, $is_amp = true, $session_id = false) * To override this function, the event must set $append_sid_override to * the new URL value, which will be returned following the event * - * @event core.append_sid_override + * @event core.append_sid * @var string url The url the session id needs to be * appended to (can have params) * @var mixed params String or array of additional url @@ -2262,13 +2262,25 @@ function append_sid($url, $params = false, $is_amp = true, $session_id = false) * @since 3.1-A1 */ $vars = array('url', 'params', 'is_amp', 'session_id', 'append_sid_override'); - extract($phpbb_dispatcher->trigger_event('core.append_sid_override', compact($vars))); + extract($phpbb_dispatcher->trigger_event('core.append_sid', compact($vars))); if ($append_sid_override) { return $append_sid_override; } + // The following hook remains for backwards compatibility, though use of + // the event above is preferred. + // Developers using the hook function need to globalise the $_SID and $_EXTRA_URL on their own and also handle it appropriately. + // They could mimic most of what is within this function + if (!empty($phpbb_hook) && $phpbb_hook->call_hook(__FUNCTION__, $url, $params, $is_amp, $session_id)) + { + if ($phpbb_hook->hook_return(__FUNCTION__)) + { + return $phpbb_hook->hook_return_result(__FUNCTION__); + } + } + $params_is_array = is_array($params); // Get anchor |