Merge branch 'master' of git://github.com/tobiasd/friendika

1 files changed, 14 insertions, 0 deletions

diff --git a/boot.php b/boot.php
index 86ad29296..adb1b96f8 100644
--- a/boot.php
+++ b/boot.php
@@ -2215,3 +2215,17 @@ function link_compare($a,$b) {
 		return true;
 	return false;
 }}
+
+
+if(! function_exists('prepare_body')) {
+function prepare_body($item) {
+
+	require_once('include/bbcode.php');
+
+	$s = smilies(bbcode($item['body']));
+
+	return $s;
+
+
+
+}}
\ No newline at end of file