mexon/friendica
1
0
Fork 0
Code Pull requests Activity

Merge pull request #11114 from annando/issue-11104

Browse source 
Issue 11104: Don't execute the addons on Diaspora reshare
This commit is contained in:
Hypolite Petovan 2021-12-21 17:31:32 -05:00 committed by GitHub
parent 3774eec3e0 a97bfb512a
commit a06ab22f24
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Model/Item.php
View file

@ -949,7 +949,9 @@ class Item
$item['parent'] = $parent_id; $item['parent'] = $parent_id;
// Trigger automatic reactions for addons // Trigger automatic reactions for addons
if (!isset($item['api_source'])) {
$item['api_source'] = true; $item['api_source'] = true;
}
// We have to tell the hooks who we are - this really should be improved // We have to tell the hooks who we are - this really should be improved
if (!local_user()) { if (!local_user()) {

3
src/Protocol/Diaspora.php
View file

@ -4100,6 +4100,9 @@ class Diaspora
$item['private'] = Item::PUBLIC; $item['private'] = Item::PUBLIC;
} }
// Don't trigger the addons
$item['api_source'] = false;
return Item::insert($item, true); return Item::insert($item, true);
} }
} }