diff options
| author | friendica <info@friendica.com> | 2014-12-01 18:53:49 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-12-01 18:53:49 -0800 |
| commit | f3b92c0ef228a25c6d6734d60a23251506317b3f (patch) | |
| tree | f20fa34ea54008af6b6ea39cf9e6800ee3aec3e8 /include | |
| parent | 0b84ba1eab8a583f7cf89f44f37b78e9cac72e1b (diff) | |
| parent | 460d379e7efc074808109b4c9acd0aea46460d16 (diff) | |
| download | volse-hubzilla-f3b92c0ef228a25c6d6734d60a23251506317b3f.tar.gz volse-hubzilla-f3b92c0ef228a25c6d6734d60a23251506317b3f.tar.bz2 volse-hubzilla-f3b92c0ef228a25c6d6734d60a23251506317b3f.zip | |
Merge https://github.com/friendica/red into pending_merge
Conflicts:
version.inc
Diffstat (limited to 'include')
| -rw-r--r-- | include/Contact.php | 10 | ||||
| -rw-r--r-- | include/conversation.php | 4 | ||||
| -rw-r--r-- | include/zot.php | 1 |
3 files changed, 9 insertions, 6 deletions
diff --git a/include/Contact.php b/include/Contact.php index f0c7cd737..64779d45f 100644 --- a/include/Contact.php +++ b/include/Contact.php @@ -128,12 +128,14 @@ function vcard_from_xchan($xchan, $observer = null, $mode = '') { function abook_toggle_flag($abook,$flag) { - $r = q("UPDATE abook set abook_flags = (abook_flags & ~%d) where abook_id = %d and abook_channel = %d", - intval($flag), - intval($abook['abook_id']), - intval($abook['abook_channel']) + $r = q("UPDATE abook set abook_flags = (abook_flags %s %d) where abook_id = %d and abook_channel = %d", + db_getfunc('^'), + intval($flag), + intval($abook['abook_id']), + intval($abook['abook_channel']) ); + // if unsetting the archive bit, update the timestamps so we'll try to connect for an additional 30 days. if(($flag === ABOOK_FLAG_ARCHIVED) && ($abook['abook_flags'] & ABOOK_FLAG_ARCHIVED)) { diff --git a/include/conversation.php b/include/conversation.php index 425a655f7..6b3e278f0 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -915,8 +915,8 @@ function item_photo_menu($item){ if($contact) { $poke_link = $a->get_baseurl($ssl_state) . '/poke/?f=&c=' . $contact['abook_id']; - if (!($contact['abook_flags'] & ABOOK_FLAG_SELF)) - $contact_url = $a->get_baseurl($ssl_state) . '/connedit/' . $contact['abook_id']; + if (!($contact['abook_flags'] & ABOOK_FLAG_SELF)) + $contact_url = $a->get_baseurl($ssl_state) . '/connedit/' . $contact['abook_id']; $posts_link = $a->get_baseurl($ssl_state) . '/network/?cid=' . $contact['abook_id']; $clean_url = normalise_link($item['author-link']); diff --git a/include/zot.php b/include/zot.php index 3b8584509..a7c6e32ac 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1419,6 +1419,7 @@ function process_delivery($sender,$arr,$deliveries,$relay,$public = false,$reque } foreach($deliveries as $d) { + $public = false; $r = q("select * from channel where channel_hash = '%s' limit 1", dbesc($d['hash']) ); |