Merge remote-tracking branch 'upstream/master' into social-master

[quix0rs-gnu-social.git] / plugins / SubMirror / classes / SubMirror.php

diff --git a/plugins/SubMirror/classes/SubMirror.php b/plugins/SubMirror/classes/SubMirror.php
index 0920856192f1487f1516b94d700b19c1e0f2793d..cdbbed6726e415c2ddcbd24d18cbef7ba7a36fe6 100644 (file)
--- a/plugins/SubMirror/classes/SubMirror.php
+++ b/plugins/SubMirror/classes/SubMirror.php
@@ -179,7 +179,7 @@ class SubMirror extends Managed_DataObject
             return true;
         } else {
             common_log(LOG_INFO, "SubMirror plugin auto-repeating notice $notice->id for $profile->id");
-            return $notice->repeat($profile->id, 'mirror');
+            return $notice->repeat($profile, 'mirror');
         }
     }
 
@@ -188,13 +188,14 @@ class SubMirror extends Managed_DataObject
      * Kind of dirty, but if pulling an external data feed into an account
      * that may be what you want.
      *
-     * @param Notice $notice
-     * @return mixed Notice on successful repeat, true if already repeated, false on failure
+     * @param  Profile $profile
+     * @param  Notice  $notice
+     * @return mixed   Notice on successful repeat, true if already repeated, false on failure
      */
-    protected function copyNotice($profile, $notice)
+    protected function copyNotice(Profile $profile, Notice $notice)
     {
         $options = array('is_local' => Notice::LOCAL_PUBLIC,
-                         'url' => $notice->bestUrl(), // pass through the foreign link...
+                         'url' => $notice->getUrl(), // pass through the foreign link...
                          'rendered' => $notice->rendered);
 
         $saved = Notice::saveNew($profile->id,