revert html in markdown for posts, but trim the input before processing the markdown

2 files changed, 2 insertions, 2 deletions

diff --git a/include/items.php b/include/items.php
index 3e4805212..fd23b7e6b 100755
--- a/include/items.php
+++ b/include/items.php
@@ -3181,7 +3181,7 @@ function tag_deliver($uid, $item_id) {
 	}
 
 	if((! $mention) && (! $union)) {
-		logger('tag_deliver: no mention and no union.');
+		logger('tag_deliver: no mention for ' . $u[0]['channel_name'] . ' and no union.');
 		return;
 	}
 
diff --git a/mod/item.php b/mod/item.php
index 5bf59de26..b66d71797 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -473,8 +473,8 @@ function item_post(&$a) {
 		require_once('include/text.php');			
 		if($uid && $uid == $profile_uid && feature_enabled($uid,'markdown')) {
 			require_once('include/bb2diaspora.php');
+			$body = escape_tags(trim($body));
 			$body = str_replace("\n",'<br />', $body);
-			$body = purify_html($body);
 
 			$body = preg_replace_callback('/\[share(.*?)\]/ism','share_shield',$body);			
 			$body = diaspora2bb($body,true);