diff --git a/checkin_notes b/checkin_notes index 2c35392d58..9c7300c67f 100644 --- a/checkin_notes +++ b/checkin_notes @@ -5206,7 +5206,7 @@ David 26 Aug 2011 html/user/ forum_thread.php -David 26 Aug 2011 +David 27 Aug 2011 - web: add a magic header string that supposedly will make Recaptcha work on some IE variants. WTF?? @@ -5216,3 +5216,14 @@ David 26 Aug 2011 user/ create_account_form.php create_profile.php + +David 28 Aug 2011 + - web: fix to the above + - web: fix forum search + + html/ + inc/ + util.inc + user/ + forum_search.php + forum_search_action.php diff --git a/html/inc/util.inc b/html/inc/util.inc index 1c13cdba5f..35fb086856 100644 --- a/html/inc/util.inc +++ b/html/inc/util.inc @@ -148,15 +148,18 @@ function page_head( echo ""; + echo "\n"; + if ($head_extra) { + echo "\n$head_extra\n"; + } if (!$title_plain) { - echo "".sanitize_tags($title)."\n"; + echo "".sanitize_tags($title)."\n"; } else { - echo "".sanitize_tags($title_plain)."\n"; + echo "".sanitize_tags($title_plain)."\n"; } echo " - $head_extra "; if ($java_onload){ diff --git a/html/user/forum_search.php b/html/user/forum_search.php index 78d12413f1..293e0a47ea 100644 --- a/html/user/forum_search.php +++ b/html/user/forum_search.php @@ -31,7 +31,7 @@ echo "
"; row1(tra("Search query")); row2(tra("Search for keywords:")."
".tra("Posts that contain all the specified words will be displayed")."", - "
+ "
".tra("For example: \"screensaver freeze\"").""); row2(tra("Search for author ID:")."
".tra("Only posts by this author will be displayed")."", diff --git a/html/user/forum_search_action.php b/html/user/forum_search_action.php index f8a3aac590..aa541b9289 100644 --- a/html/user/forum_search_action.php +++ b/html/user/forum_search_action.php @@ -87,7 +87,7 @@ function search_post_content( $search_string="%"; foreach ($keyword_list as $key => $word){ - $search_string.=BoincDb::escape_string($word)."%"; + $search_string .= BoincDb::escape_string($word)."%"; } $optional_join = ""; // if looking in a single forum, need to join w/ thread table