diff options
| author | friendica <info@friendica.com> | 2015-01-21 16:06:25 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-01-21 16:06:25 -0800 |
| commit | 29436081a86650e7905a79eba4fdf7dc12f1c7c9 (patch) | |
| tree | 2f7e69d1cd55267bdc9eb604d1084e3d2f6ebc88 /include/diaspora.php | |
| parent | 51848c619080e19cace647966a17eb9a1b42ca25 (diff) | |
| download | volse-hubzilla-29436081a86650e7905a79eba4fdf7dc12f1c7c9.tar.gz volse-hubzilla-29436081a86650e7905a79eba4fdf7dc12f1c7c9.tar.bz2 volse-hubzilla-29436081a86650e7905a79eba4fdf7dc12f1c7c9.zip | |
slow progress removing bitfields on item table
Diffstat (limited to 'include/diaspora.php')
| -rwxr-xr-x | include/diaspora.php | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/include/diaspora.php b/include/diaspora.php index e494aac0f..ae405f663 100755 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -1414,7 +1414,7 @@ function diaspora_comment($importer,$xml,$msg) { if($result && $result['success']) $message_id = $result['item_id']; - if(($parent_item['item_flags'] & ITEM_ORIGIN) && (! $parent_author_signature)) { + if(intval($parent_item['item_origin']) && (! $parent_author_signature)) { // if the message isn't already being relayed, notify others // the existence of parent_author_signature means the parent_author or owner // is already relaying. @@ -1996,7 +1996,7 @@ function diaspora_like($importer,$xml,$msg) { // the existence of parent_author_signature means the parent_author or owner // is already relaying. The parent_item['origin'] indicates the message was created on our system - if(($parent_item['item_flags'] & ITEM_ORIGIN) && (! $parent_author_signature)) + if(intval($parent_item['item_origin']) && (! $parent_author_signature)) proc_run('php','include/notifier.php','comment-import',$message_id); return; @@ -2105,19 +2105,12 @@ function diaspora_signed_retraction($importer,$xml,$msg) { $r[0]['parent'] ); if($p) { - if(($p[0]['item_flags'] & ITEM_ORIGIN) && (! $parent_author_signature)) { -// FIXME so we can relay this -// q("insert into sign (`retract_iid`,`signed_text`,`signature`,`signer`) values (%d,'%s','%s','%s') ", -// $r[0]['id'], -// dbesc($signed_data), -// dbesc($sig), -// dbesc($diaspora_handle) -// ); + if(intval($p[0]['item_origin']) && (! $parent_author_signature)) { // the existence of parent_author_signature would have meant the parent_author or owner // is already relaying. - logger('diaspora_signed_retraction: relaying relayable_retraction'); + logger('diaspora_signed_retraction: relaying relayable_retraction'); proc_run('php','include/notifier.php','drop',$r[0]['id']); } } |