Merge branch 'nightly' of git.gnu.io:gnu/gnu-social into nightly

diff --git a/classes/Profile.php b/classes/Profile.php
index 49addfe47fe887d72d84f73c57fde62c25ed1098..78ef18484c7e0d9f7c9f2559cb419783f39fd1ad 100644 (file)
--- a/classes/Profile.php
+++ b/classes/Profile.php
@@ -1242,8 +1242,9 @@ class Profile extends Managed_DataObject
     {
         // XXX: not really a pkey, but should work
 
-        $notice = Notice::pkeyGet(array('profile_id' => $this->id,
-                                        'repeat_of' => $notice->id));
+        $notice = Notice::pkeyGet(array('profile_id' => $this->getID(),
+                                        'repeat_of' => $notice->getID(),
+                                        'verb' => ActivityVerb::SHARE));
 
         return !empty($notice);
     }

diff --git a/plugins/Share/SharePlugin.php b/plugins/Share/SharePlugin.php
index 1f6ddbaa3fb723dea736748bb2217ff7247f83b1..84174a0440895d597e657d99f014b04bf66e573b 100644 (file)
--- a/plugins/Share/SharePlugin.php
+++ b/plugins/Share/SharePlugin.php
@@ -281,7 +281,8 @@ class SharePlugin extends ActivityVerbHandlerPlugin
         if ($status['repeated'] === true) {
             // Qvitter API wants the "repeated_id" value set too.
             $repeated = Notice::pkeyGet(array('profile_id' => $scoped->getID(),
-                                              'repeat_of' => $notice->getID()));
+                                              'repeat_of' => $notice->getID(),
+                                              'verb' => ActivityVerb::SHARE));
             $status['repeated_id'] = $repeated->getID();
         }
     }