Merge pull request #1127 from Beanow/hotfix/whitespace-issue

Fixed whitespace issue causing trueish results in templates.

include/text.php

@@ -1503,7 +1503,7 @@ function prepare_text($text) {
 	else
 		$s = smilies(bbcode($text));
 
-	return $s;
+	return trim($s);
 }}