From: Mikael Nordfeldth <mmn@hethane.se>
Date: Mon, 4 Jan 2016 01:04:18 +0000 (+0100)
Subject: We would end up with a Managed_DataObject if now match was found
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=fb537fb7f455cde9c4ccd9f6e54e734467d4f4b3;p=quix0rs-gnu-social.git

We would end up with a Managed_DataObject if now match was found

meaning we'd return for example a Notice with empty id (translated into 0)
and thus Faves coming in from remote instances where the fave'd notice was
not found would result in faving the first Notice in a table-wide search,
i.e. often the first post on the instance.

Whoopie!
---

diff --git a/lib/activityutils.php b/lib/activityutils.php
index c8e5808251..8a2be35022 100644
--- a/lib/activityutils.php
+++ b/lib/activityutils.php
@@ -380,23 +380,24 @@ class ActivityUtils
     }
 
     static function findLocalObject(array $uris, $type=ActivityObject::NOTE) {
-        $object = null;
-        // TODO: Extend this in plugins etc.
-        if (Event::handle('StartFindLocalActivityObject', array($uris, $type, &$object))) {
+        $obj_class = null;
+        // TODO: Extend this in plugins etc. and describe in EVENTS.txt
+        if (Event::handle('StartFindLocalActivityObject', array($uris, $type, &$obj_class))) {
             switch (self::resolveUri($type)) {
             case ActivityObject::PERSON:
                 // GROUP will also be here in due time...
-                $object = new Profile();
+                $obj_class = 'Profile';
                 break;
             default:
-                $object = new Notice();
+                $obj_class = 'Notice';
             }
         }
+        $object = null;
         $uris = array_unique($uris);
         foreach ($uris as $uri) {
             try {
                 // the exception thrown will cancel before reaching $object
-                $object = call_user_func(array($object, 'fromUri'), $uri);
+                $object = call_user_func("{$obj_class}::fromUri", $uri);
                 break;
             } catch (UnknownUriException $e) {
                 common_debug('Could not find local activity object from uri: '.$e->object_uri);