# This patch file was generated by NetBeans IDE
# This patch can be applied using context Tools: Apply Diff Patch action on respective folder.
# It uses platform neutral UTF-8 encoding.
# Above lines and this line are ignored by the patching process.
Index: moodle/mod/forum/view.php
--- moodle/mod/forum/view.php Base (1.106.2.20)
+++ moodle/mod/forum/view.php Locally Modified (Based On 1.106.2.20)
@@ -58,9 +58,7 @@
         error('Must specify a course module or a forum ID');
     }
 
-    if (!$buttontext) {
-        $buttontext = forum_search_form($course, $search);
-    }
+    $buttontext = forum_search_form($course, $search).$buttontext; //no risk of PHP-notice as $buttontext is already initialized to empty string
 
     $context = get_context_instance(CONTEXT_MODULE, $cm->id);
 
Index: moodle/theme/standard/styles_layout.css
--- moodle/theme/standard/styles_layout.css Base (1.516.2.82)
+++ moodle/theme/standard/styles_layout.css Locally Modified (Based On 1.516.2.82)
@@ -720,6 +720,10 @@
   float:right;
 }
 
+.navbar .navbutton form {
+    padding-left:1.5em;
+}
+
 #footer .navbar {
   margin-top: 4em;
 }