fix issue where event items were parsed multiple times

3 files changed, 12 insertions, 6 deletions

diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php
index eb1020cd2..1082bf642 100644
--- a/Zotlabs/Lib/ThreadItem.php
+++ b/Zotlabs/Lib/ThreadItem.php
@@ -362,7 +362,8 @@ class ThreadItem {
 
 		localize_item($item);
 
-		$body = prepare_body($item,true);
+		$opts = (($item['resource_type'] === 'event') ? ['is_event_item' => true] : []);
+		$body = prepare_body($item, true, $opts);
 
 		// $viewthread (below) is only valid in list mode. If this is a channel page, build the thread viewing link
 		// since we can't depend on llink or plink pointing to the right local location.
diff --git a/include/text.php b/include/text.php
index b9ec90e92..b03e2d1a9 100644
--- a/include/text.php
+++ b/include/text.php
@@ -2082,10 +2082,15 @@ function prepare_text($text, $content_type = 'text/bbcode', $opts = false) {
 		default:
 			require_once('include/bbcode.php');
 
-			if(stristr($text, '[nosmile]'))
-				$s = bbcode($text, ((is_array($opts)) ? $opts : [] ));
-			else
-				$s = smilies(bbcode($text, ((is_array($opts)) ? $opts : [] )));
+			// events are handled in format_event_obj()
+			if (empty($opts['is_event_item'])) {
+				if(stristr($text, '[nosmile]')) {
+					$s = bbcode($text, ((is_array($opts)) ? $opts : [] ));
+				}
+				else {
+					$s = smilies(bbcode($text, ((is_array($opts)) ? $opts : [] )));
+				}
+			}
 
 			$s = zidify_links($s);
 
diff --git a/view/js/main.js b/view/js/main.js
index 7eca7408e..6fda3c8d0 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -1008,7 +1008,7 @@ function liveUpdate(notify_id) {
 			in_progress = false;
 			liveRecurse ++;
 			if(liveRecurse < 10) {
-				liveUpdate();
+				liveUpdate(notify_id);
 			}
 			else {
 				console.log('Incomplete data. Too many attempts. Giving up.');