Merge branch '3.8RC' of https://framagit.org/hubzilla/core into 3.8RC

Zotlabs/Module/Viewsrc.php

@@ -47,7 +47,7 @@ class Viewsrc extends \Zotlabs\Web\Controller {
 
 
 				$content = escape_tags($r[0]['body']);
-				$o = (($json) ? json_encode($content) : str_replace("\n",'<br />',$content));
+				$o = (($json) ? json_encode($content) : $content);
 			}
 		}
 	

include/channel.php

@@ -2533,6 +2533,12 @@ function channel_remove($channel_id, $local = true, $unset_session = false) {
 
 	if(! $local) {
 
+		if(intval($r[0]['channel_removed'])) {
+			// already removed. do not propagate deletion of a channel which
+			// may have been removed locally at some previous time.
+			return;
+		}
+
 		$r = q("update channel set channel_deleted = '%s', channel_removed = 1 where channel_id = %d",
 			dbesc(datetime_convert()),
 			intval($channel_id)