diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2011-09-05 02:42:41 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2011-09-05 02:42:41 -0400 |
| commit | cf5f0cce83486af04e94e2edfd0b5ad547cdf484 (patch) | |
| tree | 4e0759a03716cbc86ce9442662ece5dcb4c4acb9 /phpBB/includes/functions.php | |
| parent | 8e5eacf6924866a66bd939292e787caea4b7a32e (diff) | |
| parent | 5d66faafc159da90fbbc6d9888b0a6eee9570cd8 (diff) | |
| download | forums-cf5f0cce83486af04e94e2edfd0b5ad547cdf484.tar forums-cf5f0cce83486af04e94e2edfd0b5ad547cdf484.tar.gz forums-cf5f0cce83486af04e94e2edfd0b5ad547cdf484.tar.bz2 forums-cf5f0cce83486af04e94e2edfd0b5ad547cdf484.tar.xz forums-cf5f0cce83486af04e94e2edfd0b5ad547cdf484.zip | |
Merge remote-tracking branch 'nickvergessen/ticket/10321' into develop-olympus
* nickvergessen/ticket/10321:
[ticket/10321] Add descriptions to the unit tests
[ticket/10321] Do not append the ? if the param-list is empty anyway.
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index df49bdf637..628f8ee123 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2225,6 +2225,12 @@ function append_sid($url, $params = false, $is_amp = true, $session_id = false) { global $_SID, $_EXTRA_URL, $phpbb_hook; + if ($params === '' || (is_array($params) && empty($params))) + { + // Do not append the ? if the param-list is empty anyway. + $params = false; + } + // 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)) |