Merge branch 'tagprofile-ajax-fix' into 'nightly'

[quix0rs-gnu-social.git] / plugins / Share / SharePlugin.php

diff --git a/plugins/Share/SharePlugin.php b/plugins/Share/SharePlugin.php
index eb874d2941cf193aaa749ade1e4a2766f960d610..c337efbaeca10660b02376212f006df46cee722e 100644 (file)
--- a/plugins/Share/SharePlugin.php
+++ b/plugins/Share/SharePlugin.php
@@ -161,7 +161,7 @@ class SharePlugin extends ActivityVerbHandlerPlugin
     public function extendActivity(Notice $stored, Activity $act, Profile $scoped=null)
     {
         // TODO: How to handle repeats of deleted notices?
-        $target = Notice::getById($stored->repeat_of);
+        $target = Notice::getByID($stored->repeat_of);
         // TRANS: A repeat activity's title. %1$s is repeater's nickname
         //        and %2$s is the repeated user's nickname.
         $act->title = sprintf(_('%1$s repeated a notice by %2$s'),
@@ -278,16 +278,15 @@ class SharePlugin extends ActivityVerbHandlerPlugin
      */
     public function onNoticeSimpleStatusArray($notice, array &$status, Profile $scoped=null, array $args=array())
     {
-        if ($scoped instanceof Profile) {
-            $status['repeated'] = $scoped->hasRepeated($notice);
+        $status['repeated'] = $scoped instanceof Profile
+                            ? $scoped->hasRepeated($notice)
+                            : false;
+
+        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()));
-            if ($repeated instanceof Notice) {
-                $status['repeated_id'] = $repeated->getID();
-            }
-        } else {
-            $status['repeated'] = false;
+            $status['repeated_id'] = $repeated->getID();
         }
     }