mirror of
https://github.com/moodle/moodle.git
synced 2025-08-05 17:06:53 +02:00
Improved fix to $search variable
This commit is contained in:
parent
cd6f0c1e28
commit
c7563a9c70
1 changed files with 3 additions and 5 deletions
|
@ -17,7 +17,7 @@
|
||||||
unset($searchterms[$key]);
|
unset($searchterms[$key]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$search = trim(implode(" ", $searchterms));
|
$search = s(trim(implode(" ", $searchterms)));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (! $course = get_record("course", "id", $id)) {
|
if (! $course = get_record("course", "id", $id)) {
|
||||||
|
@ -28,14 +28,14 @@
|
||||||
require_login($course->id);
|
require_login($course->id);
|
||||||
}
|
}
|
||||||
|
|
||||||
add_to_log($course->id, "forum", "search", "search.php?id=$course->id&search=".urlencode(s($search)), "$search");
|
add_to_log($course->id, "forum", "search", "search.php?id=$course->id&search=".urlencode($search)), $search);
|
||||||
|
|
||||||
$strforums = get_string("modulenameplural", "forum");
|
$strforums = get_string("modulenameplural", "forum");
|
||||||
$strsearch = get_string("search", "forum");
|
$strsearch = get_string("search", "forum");
|
||||||
$strsearchresults = get_string("searchresults", "forum");
|
$strsearchresults = get_string("searchresults", "forum");
|
||||||
$strpage = get_string("page");
|
$strpage = get_string("page");
|
||||||
|
|
||||||
$searchform = forum_print_search_form($course, s($search), true, "plain");
|
$searchform = forum_print_search_form($course, $search, true, "plain");
|
||||||
|
|
||||||
if (!$search) {
|
if (!$search) {
|
||||||
print_header("$course->shortname: $strsearch", "$course->fullname",
|
print_header("$course->shortname: $strsearch", "$course->fullname",
|
||||||
|
@ -56,8 +56,6 @@
|
||||||
|
|
||||||
if ($search) {
|
if ($search) {
|
||||||
|
|
||||||
$search = s($search);
|
|
||||||
|
|
||||||
if (!$posts = forum_search_posts($searchterms, $course->id, $page*$perpage, $perpage, $totalcount)) {
|
if (!$posts = forum_search_posts($searchterms, $course->id, $page*$perpage, $perpage, $totalcount)) {
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue