Commit 42c653a9 authored by mmn's avatar mmn

Merge commit '5c4a7a10' into nightly

hannes making sure notice is a repeat and not a delete activity notice
parents 8d1105fe 5c4a7a10
......@@ -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
......@@ -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
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment