[Phpbb-checkins] r9850 - in /branches/phpBB-3_0_0/phpBB: docs/CHANGELOG.html search.php

[Nils A. <nad...@ph...>]

Author: naderman
Date: Sat Jul 25 13:35:46 2009
New Revision: 9850

Log:
Correctly propagate umlauts over search result pages [Bug #33755]

Modified:
    branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
    branches/phpBB-3_0_0/phpBB/search.php

Modified: branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html (original)
--- branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html Sat Jul 25 13:35:46 2009
***************
*** 176,181 ****
--- 176,182 ----
  		<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 &quot;Locked&quot; button instead of &quot;Reply&quot; 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>

Modified: branches/phpBB-3_0_0/phpBB/search.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/search.php (original)
--- branches/phpBB-3_0_0/phpBB/search.php Sat Jul 25 13:35:46 2009
***************
*** 545,551 ****
  
  	$u_search = append_sid("{$phpbb_root_path}search.$phpEx", $u_sort_param . $u_show_results);
  	$u_search .= ($search_id) ? '&amp;search_id=' . $search_id : '';
! 	$u_search .= ($u_hilit) ? '&amp;keywords=' . urlencode(htmlspecialchars_decode($search->search_query)) : '';
  	$u_search .= ($search_terms != 'all') ? '&amp;terms=' . $search_terms : '';
  	$u_search .= ($topic_id) ? '&amp;t=' . $topic_id : '';
  	$u_search .= ($author) ? '&amp;author=' . urlencode(htmlspecialchars_decode($author)) : '';
--- 545,551 ----
  
  	$u_search = append_sid("{$phpbb_root_path}search.$phpEx", $u_sort_param . $u_show_results);
  	$u_search .= ($search_id) ? '&amp;search_id=' . $search_id : '';
! 	$u_search .= ($u_hilit) ? '&amp;keywords=' . urlencode(htmlspecialchars_decode($keywords)) : '';
  	$u_search .= ($search_terms != 'all') ? '&amp;terms=' . $search_terms : '';
  	$u_search .= ($topic_id) ? '&amp;t=' . $topic_id : '';
  	$u_search .= ($author) ? '&amp;author=' . urlencode(htmlspecialchars_decode($author)) : '';