diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2011-08-21 13:14:15 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2011-08-21 13:16:05 +0200 |
| commit | dc149a43e49c1c2160549e25792c5ee650861e02 (patch) | |
| tree | 05b2f814a1202b3d145863393ed2cf6a3f5c0d5d /phpBB | |
| parent | 1680b3a2a7614fb35d9119652140db2ff8bf5b0e (diff) | |
| download | forums-dc149a43e49c1c2160549e25792c5ee650861e02.tar forums-dc149a43e49c1c2160549e25792c5ee650861e02.tar.gz forums-dc149a43e49c1c2160549e25792c5ee650861e02.tar.bz2 forums-dc149a43e49c1c2160549e25792c5ee650861e02.tar.xz forums-dc149a43e49c1c2160549e25792c5ee650861e02.zip | |
[ticket/10321] Do not append the ? if the param-list is empty anyway.
PHPBB3-10321
Diffstat (limited to 'phpBB')
| -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 6b6679bde5..c6258588ca 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)) |