harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mario Vavti 2018-10-05 12:10:15 +02:00
commit c403c9aece
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Zotlabs/Module/Viewsrc.php
View File

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

6
include/channel.php
View File

@ -2533,6 +2533,12 @@ function channel_remove($channel_id, $local = true, $unset_session = false) {
if(! $local) { 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", $r = q("update channel set channel_deleted = '%s', channel_removed = 1 where channel_id = %d",
dbesc(datetime_convert()), dbesc(datetime_convert()),
intval($channel_id) intval($channel_id)