friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Some beautification

This commit is contained in:
Michael 2018-10-12 20:52:22 +00:00
parent 5af0ee1b95
commit 4d4dd1a99c
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/Model/Item.php
View File

@ -1289,18 +1289,17 @@ class Item extends BaseObject
*/ */
$dsprsig = null; $dsprsig = null;
if (x($item, 'dsprsig')) { if (isset($item['dsprsig'])) {
$encoded_signature = $item['dsprsig']; $encoded_signature = $item['dsprsig'];
$dsprsig = json_decode(base64_decode($item['dsprsig'])); $dsprsig = json_decode(base64_decode($item['dsprsig']));
unset($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']; $diaspora_signed_text = $item['diaspora_signed_text'];
} else { unset($item['diaspora_signed_text']);
$diaspora_signed_text = '';
} }
unset($item['diaspora_signed_text']);
// Converting the plink // Converting the plink
/// @TODO Check if this is really still needed /// @TODO Check if this is really still needed
@ -1488,6 +1487,7 @@ class Item extends BaseObject
$deny_gid = ''; $deny_gid = '';
if ($item['parent-uri'] === $item['uri']) { if ($item['parent-uri'] === $item['uri']) {
$diaspora_signed_text = '';
$parent_id = 0; $parent_id = 0;
$parent_deleted = 0; $parent_deleted = 0;
$allow_cid = $item['allow_cid']; $allow_cid = $item['allow_cid'];
@ -1534,6 +1534,10 @@ class Item extends BaseObject
$item['wall'] = $parent['wall']; $item['wall'] = $parent['wall'];
$notify_type = 'comment-new'; $notify_type = 'comment-new';
if (!$parent['origin']) {
$diaspora_signed_text = '';
}
/* /*
* If the parent is private, force privacy for the entire conversation * If the parent is private, force privacy for the entire conversation
* This differs from the above settings as it subtly allows comments from * This differs from the above settings as it subtly allows comments from
@ -1574,6 +1578,7 @@ class Item extends BaseObject
$parent_id = 0; $parent_id = 0;
$item['parent-uri'] = $item['uri']; $item['parent-uri'] = $item['uri'];
$item['gravity'] = GRAVITY_PARENT; $item['gravity'] = GRAVITY_PARENT;
$diaspora_signed_text = '';
} else { } else {
logger('item parent '.$item['parent-uri'].' for '.$item['uid'].' was not found - ignoring item'); logger('item parent '.$item['parent-uri'].' for '.$item['uid'].' was not found - ignoring item');
return 0; return 0;