diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-09-18 15:24:40 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-09-18 15:24:40 +0000 |
| commit | 7c99035c21fad4dcd5ae2dd37420efc50913a153 (patch) | |
| tree | 84b991b3e49d49d2032eac0fea2ab25a8bd5bec9 /phpBB | |
| parent | b91b43d22ce5baa6cdc552cd343dc2bfdce134ff (diff) | |
| download | forums-7c99035c21fad4dcd5ae2dd37420efc50913a153.tar forums-7c99035c21fad4dcd5ae2dd37420efc50913a153.tar.gz forums-7c99035c21fad4dcd5ae2dd37420efc50913a153.tar.bz2 forums-7c99035c21fad4dcd5ae2dd37420efc50913a153.tar.xz forums-7c99035c21fad4dcd5ae2dd37420efc50913a153.zip | |
Pass S_SEARCH_ACTION through append_sid() in search.php. (Bug #21585)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8885 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/search.php | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index da403c5fbf..84093953b0 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -117,6 +117,7 @@ <li>[Fix] Display assigned rank/avatar for guests. (Bug #19155)</li> <li>[Fix] Set secure cookie for style switcher if required. (Bug #19625)</li> <li>[Fix] Fix native full text search on postgresql while using excluding keyword matches. (Bug #19195)</li> + <li>[Fix] Pass S_SEARCH_ACTION through append_sid() in search.php. (Bug #21585)</li> <li>[Change] No longer allow the direct use of MULTI_INSERT in sql_build_array. sql_multi_insert() must be used.</li> <li>[Change] Display warning in ACP if config.php file is left writable.</li> diff --git a/phpBB/search.php b/phpBB/search.php index 0066680457..3a8b3cdc0d 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -1053,7 +1053,7 @@ if (!empty($_EXTRA_URL)) } $template->assign_vars(array( - 'S_SEARCH_ACTION' => "{$phpbb_root_path}search.$phpEx", + 'S_SEARCH_ACTION' => append_sid("{$phpbb_root_path}search.$phpEx", false, true, 0), // We force no ?sid= appending by using 0 'S_HIDDEN_FIELDS' => build_hidden_fields($s_hidden_fields), 'S_CHARACTER_OPTIONS' => $s_characters, 'S_FORUM_OPTIONS' => $s_forums, |