aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2018-10-05 11:40:50 +0200
committerMario Vavti <mario@mariovavti.com>2018-10-05 11:40:50 +0200
commit69659e9bd55f11e63fc93a8e6c5d5deea1489931 (patch)
treebad7d3580c54940d62e7555ec2a1f74c89cb9629 /Zotlabs
parent6c066f6107c6a2978de34a4f1b383191a92ecdba (diff)
parentd33c331abd3ae500fc7cdac206ea647c4c71905e (diff)
downloadvolse-hubzilla-69659e9bd55f11e63fc93a8e6c5d5deea1489931.tar.gz
volse-hubzilla-69659e9bd55f11e63fc93a8e6c5d5deea1489931.tar.bz2
volse-hubzilla-69659e9bd55f11e63fc93a8e6c5d5deea1489931.zip
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Module/Viewsrc.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/Zotlabs/Module/Viewsrc.php b/Zotlabs/Module/Viewsrc.php
index 5900e385a..119990b57 100644
--- 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);
}
}