diff options
| author | Nils Adermann <naderman@naderman.de> | 2009-07-25 12:35:46 +0000 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2009-07-25 12:35:46 +0000 |
| commit | 1dcd7d2da8175b2ec099f4b07168b1d6c0a055e3 (patch) | |
| tree | 8cd9f210a9dbd496e4cb747e60c87fced2323569 /phpBB | |
| parent | bac1e57c188e0289edce102b21224bba3219fd52 (diff) | |
| download | forums-1dcd7d2da8175b2ec099f4b07168b1d6c0a055e3.tar forums-1dcd7d2da8175b2ec099f4b07168b1d6c0a055e3.tar.gz forums-1dcd7d2da8175b2ec099f4b07168b1d6c0a055e3.tar.bz2 forums-1dcd7d2da8175b2ec099f4b07168b1d6c0a055e3.tar.xz forums-1dcd7d2da8175b2ec099f4b07168b1d6c0a055e3.zip | |
Correctly propagate umlauts over search result pages [Bug #33755]
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9850 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 a4cfe2704e..6a7b7a0627 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -176,6 +176,7 @@ <li>[Fix] Do not cut post-message in between HTML-Entities on search.php (Bug #31505 - Patch by leviatan21)</li> <li>[Fix] Correctly set attachment flag for topics, posts and pms after deleting attachments (Bug #48265 - Patch by WorldWar and nickvergessen)</li> <li>[Fix] Display "Locked" button instead of "Reply" one for locked forum in viewtopic (prosilver). (Bug #38055 - Patch by Raimon)</li> + <li>[Fix] Correctly propagate umlauts over search result pages (Bug #33755)</li> <li>[Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.</li> <li>[Change] Add index on log_time to the log table to prevent slowdown on boards with many log entries. (Bug #44665 - Patch by bantu)</li> <li>[Change] Template engine now permits to a limited extent variable includes.</li> diff --git a/phpBB/search.php b/phpBB/search.php index 61aa16a6fb..65e56b5d31 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -545,7 +545,7 @@ if ($keywords || $author || $author_id || $search_id || $submit) $u_search = append_sid("{$phpbb_root_path}search.$phpEx", $u_sort_param . $u_show_results); $u_search .= ($search_id) ? '&search_id=' . $search_id : ''; - $u_search .= ($u_hilit) ? '&keywords=' . urlencode(htmlspecialchars_decode($search->search_query)) : ''; + $u_search .= ($u_hilit) ? '&keywords=' . urlencode(htmlspecialchars_decode($keywords)) : ''; $u_search .= ($search_terms != 'all') ? '&terms=' . $search_terms : ''; $u_search .= ($topic_id) ? '&t=' . $topic_id : ''; $u_search .= ($author) ? '&author=' . urlencode(htmlspecialchars_decode($author)) : ''; |