wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit '5c4a7a10' into nightly

Browse Source 
hannes making sure notice is a repeat and not a delete activity notice
This commit is contained in:
Mikael Nordfeldth 2015-12-14 21:42:08 +01:00
commit 42c653a9d0
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
classes/Profile.php
View File

@ -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);
}
}
}

5
plugins/Share/SharePlugin.php
View 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;
}
}
}