diff options
| author | friendica <info@friendica.com> | 2014-04-07 13:13:00 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-04-07 13:13:00 -0700 |
| commit | 7e160a7b048c50a8b7c7a7e6e99687bbedcb3487 (patch) | |
| tree | be1a85291d349bac82d5be1b4c6aeea6da9e88aa /include/zot.php | |
| parent | 10167fdf515e69c4645da9b0a020d0594c7a55a3 (diff) | |
| download | volse-hubzilla-7e160a7b048c50a8b7c7a7e6e99687bbedcb3487.tar.gz volse-hubzilla-7e160a7b048c50a8b7c7a7e6e99687bbedcb3487.tar.bz2 volse-hubzilla-7e160a7b048c50a8b7c7a7e6e99687bbedcb3487.zip | |
undo one of yesterday's changes - if a channel was deleted we want to mark the hubloc deleted - but not the xchan. The channel might be alive at another hubloc. We should only mark the xchan deleted when removing a channel from the entire network - e.g. there are no hubs left to service it.
Diffstat (limited to 'include/zot.php')
| -rw-r--r-- | include/zot.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/zot.php b/include/zot.php index 45df09661..490d63798 100644 --- a/include/zot.php +++ b/include/zot.php @@ -632,10 +632,10 @@ function import_xchan($arr,$ud_flags = UPDATE_FLAGS_UPDATED) { if($adult_changed) $new_flags = $new_flags ^ XCHAN_FLAGS_SELFCENSORED; - $deleted = (($r[0]['xchan_flags'] & XCHAN_FLAGS_DELETED) ? true : false); - $deleted_changed = ((intval($deleted) != intval($arr['deleted'])) ? true : false); - if($deleted_changed) - $new_flags = $new_flags ^ XCHAN_FLAGS_DELETED; +// $deleted = (($r[0]['xchan_flags'] & XCHAN_FLAGS_DELETED) ? true : false); +// $deleted_changed = ((intval($deleted) != intval($arr['deleted'])) ? true : false); +// if($deleted_changed) +// $new_flags = $new_flags ^ XCHAN_FLAGS_DELETED; @@ -683,8 +683,8 @@ function import_xchan($arr,$ud_flags = UPDATE_FLAGS_UPDATED) { $new_flags = 0; if($arr['adult_content']) $new_flags |= XCHAN_FLAGS_SELFCENSORED; - if($arr['deleted']) - $new_flags |= XCHAN_FLAGS_DELETED; +// if($arr['deleted']) +// $new_flags |= XCHAN_FLAGS_DELETED; $x = q("insert into xchan ( xchan_hash, xchan_guid, xchan_guid_sig, xchan_pubkey, xchan_photo_mimetype, xchan_photo_l, xchan_addr, xchan_url, xchan_connurl, xchan_follow, xchan_connpage, xchan_name, xchan_network, xchan_photo_date, xchan_name_date, xchan_flags) |