Issue 11104: Don't cann the addons on Diaspora reshare

diff --git a/src/Model/Item.php b/src/Model/Item.php
index ca5e4bec02b94fa4231bba30082a09f0a6f50a56..07ae42d4a54d4c1e43c41c232d7d1583d2c49a09 100644 (file)
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -949,7 +949,9 @@ class Item
                        $item['parent'] = $parent_id;
 
                        // Trigger automatic reactions for addons
-                       $item['api_source'] = true;
+                       if (!isset($item['api_source'])) {
+                               $item['api_source'] = true;
+                       }
 
                        // We have to tell the hooks who we are - this really should be improved
                        if (!local_user()) {

diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php
index 5caa6c7a151147d53b296042af66c5872db6f3c3..3ddd5d663f483829d02e684d36385f69a025b7d9 100644 (file)
--- a/src/Protocol/Diaspora.php
+++ b/src/Protocol/Diaspora.php
@@ -4100,6 +4100,9 @@ class Diaspora
                        $item['private'] = Item::PUBLIC;
                }
 
+               // Don't trigger the addons
+               $item['api_source'] = false;
+
                return Item::insert($item, true);
        }
 }