1 files changed, 20 insertions, 1 deletions

diff --git a/boot.php b/boot.php
index 05b33abd6..36530736d 100644
--- a/boot.php
+++ b/boot.php
@@ -3,7 +3,7 @@
 set_time_limit(0);
 
 define ( 'BUILD_ID',               1033   );
-define ( 'FRIENDIKA_VERSION',      '2.01.1005' );
+define ( 'FRIENDIKA_VERSION',      '2.10.0901' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.0'  );
 
 define ( 'EOL',                    "<br />\r\n"     );
@@ -1687,6 +1687,11 @@ function activity_match($haystack,$needle) {
 if(! function_exists('get_tags')) {
 function get_tags($s) {
 	$ret = array();
+
+	// ignore anything in a code block
+
+	$s = preg_replace('/\[code\](.*?)\[\/code\]/sm','',$s);
+
 	if(preg_match_all('/([@#][^ \x0D\x0A,:?]*)([ \x0D\x0A,:?]|$)/',$s,$match)) {
 		foreach($match[1] as $match) {
 			if(strstr($match,"]")) {
@@ -2210,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