diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-10-05 11:40:50 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-10-05 11:40:50 +0200 |
| commit | 69659e9bd55f11e63fc93a8e6c5d5deea1489931 (patch) | |
| tree | bad7d3580c54940d62e7555ec2a1f74c89cb9629 | |
| parent | 6c066f6107c6a2978de34a4f1b383191a92ecdba (diff) | |
| parent | d33c331abd3ae500fc7cdac206ea647c4c71905e (diff) | |
| download | volse-hubzilla-69659e9bd55f11e63fc93a8e6c5d5deea1489931.tar.gz volse-hubzilla-69659e9bd55f11e63fc93a8e6c5d5deea1489931.tar.bz2 volse-hubzilla-69659e9bd55f11e63fc93a8e6c5d5deea1489931.zip | |
Merge remote-tracking branch 'mike/master' into dev
| -rw-r--r-- | Zotlabs/Module/Viewsrc.php | 2 | ||||
| -rw-r--r-- | include/channel.php | 6 |
2 files changed, 7 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); } } diff --git a/include/channel.php b/include/channel.php index 33e438e53..6a934cb82 100644 --- a/include/channel.php +++ b/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) |