Merge commit '5c4a7a10' into nightly

hannes making sure notice is a repeat and not a delete activity notice

diff --git a/classes/Profile.php b/classes/Profile.php
index 49addfe47fe887d72d84f73c57fde62c25ed1098..2ed48c2b4564f3b32f43337c62fd3c482226bb4d 100644 (file)
--- a/classes/Profile.php
+++ b/classes/Profile.php
@@ -1243,7 +1243,8 @@ 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));
+                                        'repeat_of' => $notice->id,
+                                        'verb' => ActivityVerb::SHARE));
 
         return !empty($notice);
     }
@@ -1662,4 +1663,4 @@ class Profile extends Managed_DataObject
     {
         return $this->getUser()->getConnectedApps($offset, $limit);
     }
-}
+}
\ No newline at end of file

diff --git a/plugins/Share/SharePlugin.php b/plugins/Share/SharePlugin.php
index 1f6ddbaa3fb723dea736748bb2217ff7247f83b1..afee7a6ef332454bf85c94cb3889c23016b37f85 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();
         }
     }
@@ -370,4 +371,4 @@ class SharePlugin extends ActivityVerbHandlerPlugin
 
         return true;
     }
-}
+}
\ No newline at end of file