X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FModel%2FItem.php;h=ed80f4e9e802acf735b6adf4e47225afd6a33f86;hb=0080d117eeb247bbb43b73d40830e7783b46dcde;hp=c0c67352e4ddbe6884189ce0fa8772c127a3aa34;hpb=67afa069abc97e3e00b78993a92881dc4afde9d7;p=friendica.git diff --git a/src/Model/Item.php b/src/Model/Item.php index c0c67352e4..ed80f4e9e8 100644 --- a/src/Model/Item.php +++ b/src/Model/Item.php @@ -1289,17 +1289,16 @@ class Item extends BaseObject */ $dsprsig = null; - if (x($item, 'dsprsig')) { + if (isset($item['dsprsig'])) { $encoded_signature = $item['dsprsig']; $dsprsig = json_decode(base64_decode($item['dsprsig'])); unset($item['dsprsig']); } - if (!empty($item['diaspora_signed_text'])) { + $diaspora_signed_text = ''; + if (isset($item['diaspora_signed_text'])) { $diaspora_signed_text = $item['diaspora_signed_text']; unset($item['diaspora_signed_text']); - } else { - $diaspora_signed_text = ''; } // Converting the plink @@ -1488,6 +1487,7 @@ class Item extends BaseObject $deny_gid = ''; if ($item['parent-uri'] === $item['uri']) { + $diaspora_signed_text = ''; $parent_id = 0; $parent_deleted = 0; $allow_cid = $item['allow_cid']; @@ -1534,6 +1534,10 @@ class Item extends BaseObject $item['wall'] = $parent['wall']; $notify_type = 'comment-new'; + if (!$parent['origin']) { + $diaspora_signed_text = ''; + } + /* * If the parent is private, force privacy for the entire conversation * This differs from the above settings as it subtly allows comments from @@ -1574,6 +1578,7 @@ class Item extends BaseObject $parent_id = 0; $item['parent-uri'] = $item['uri']; $item['gravity'] = GRAVITY_PARENT; + $diaspora_signed_text = ''; } else { logger('item parent '.$item['parent-uri'].' for '.$item['uid'].' was not found - ignoring item'); return 0;