harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'mike/master' into dev

Browse Source
This commit is contained in:
Mario Vavti 2018-10-27 13:50:30 +02:00
commit e72b0edce2
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
include/items.php
View File

@ -2150,6 +2150,7 @@ function item_store_update($arr, $allow_exec = false, $deliver = true) {
unset($arr['created']); unset($arr['created']);
unset($arr['author_xchan']); unset($arr['author_xchan']);
unset($arr['owner_xchan']); unset($arr['owner_xchan']);
unset($arr['source_xchan']);
unset($arr['thr_parent']); unset($arr['thr_parent']);
unset($arr['llink']); unset($arr['llink']);
@ -2514,7 +2515,7 @@ function tag_deliver($uid, $item_id) {
// Just start the second delivery chain to deliver the updated post // Just start the second delivery chain to deliver the updated post
// after resetting ownership and permission bits // after resetting ownership and permission bits
logger('updating edited tag_deliver post for ' . $u[0]['channel_address']); logger('updating edited tag_deliver post for ' . $u[0]['channel_address']);
start_delivery_chain($u[0], $item, $item_id, 0); start_delivery_chain($u[0], $item, $item_id, 0, true);
return; return;
} }
@ -2941,7 +2942,7 @@ function tgroup_check($uid, $item) {
* @param int $item_id * @param int $item_id
* @param boolean $parent * @param boolean $parent
*/ */
function start_delivery_chain($channel, $item, $item_id, $parent) { function start_delivery_chain($channel, $item, $item_id, $parent, $edit = false) {
$sourced = check_item_source($channel['channel_id'],$item); $sourced = check_item_source($channel['channel_id'],$item);
@ -2950,7 +2951,7 @@ function start_delivery_chain($channel, $item, $item_id, $parent) {
intval($channel['channel_id']), intval($channel['channel_id']),
dbesc(($item['source_xchan']) ? $item['source_xchan'] : $item['owner_xchan']) dbesc(($item['source_xchan']) ? $item['source_xchan'] : $item['owner_xchan'])
); );
if($r) { if($r && ! $edit) {
$t = trim($r[0]['src_tag']); $t = trim($r[0]['src_tag']);
if($t) { if($t) {
$tags = explode(',',$t); $tags = explode(',',$t);
@ -3017,9 +3018,17 @@ function start_delivery_chain($channel, $item, $item_id, $parent) {
} }
else { else {
$item_uplink = 1; $item_uplink = 1;
$r = q("update item set source_xchan = owner_xchan where id = %d",
intval($item_id) // if this is an edit, item_store_update() will have already updated the item
); // with the correct value for source_xchan (by ignoring it). We cannot set to owner_xchan
// in this case because owner_xchan will point to the parent of this chain
// and not the original sender.
if(! $edit) {
$r = q("update item set source_xchan = owner_xchan where id = %d",
intval($item_id)
);
}
} }
$title = $item['title']; $title = $item['title'];