Merged fix from stable (forum search form help button)

diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index ffe9ba49678a053c544577cdb543c0339ca0252b..1eb4979e902b1620635c631b612f16ae7b9e9d9e 100644 (file)
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -2426,8 +2426,8 @@ function forum_search_form($course, $search='') {
     global $CFG;
 
     $output  = '<table border="0" cellpadding="0" cellspacing="0"><tr><td nowrap="nowrap">';
+    $output .= '<form name="search" action="'.$CFG->wwwroot.'/mod/forum/search.php" style="display:inline">';
     $output .= helpbutton('search', get_string('search'), 'moodle', true, false, '', true);
-    $output .= '&nbsp;<form name="search" action="'.$CFG->wwwroot.'/mod/forum/search.php" style="display:inline">';
     $output .= '<input name="search" type="text" size="18" value="'.$search.'" alt="search" />';
     $output .= '<input value="'.get_string('searchforums', 'forum').'" type="submit" />';
     $output .= '<input name="id" type="hidden" value="'.$course->id.'" />';