Merge remote-tracking branch 'mike/master' into dev

2018-10-05 11:40:50 +02:00
parent 6c066f6107 d33c331abd
commit 69659e9bd5
2 changed files with 7 additions and 1 deletions
--- a/Zotlabs/Module/Viewsrc.php
+++ b/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);
 			}
 		}