Merge branch 'master' of git.gnu.io:gnu/gnu-social into nightly

[quix0rs-gnu-social.git] / plugins / ShareNotice / ShareNoticePlugin.php

diff --git a/plugins/ShareNotice/ShareNoticePlugin.php b/plugins/ShareNotice/ShareNoticePlugin.php
index fa1323d6f1b9f7c0caa8684e4dc7606a3112fa57..fb60341e3d12f78c93bff464ff71b0e51c3bb473 100644 (file)
--- a/plugins/ShareNotice/ShareNoticePlugin.php
+++ b/plugins/ShareNotice/ShareNoticePlugin.php
@@ -104,7 +104,7 @@ abstract class GenericNoticeShareTarget extends NoticeShareTarget
     {
         // TRANS: %s is notice content that is shared on Twitter, Facebook or another platform.
         $pattern = _m('"%s"');
-        $url = $this->notice->bestUrl();
+        $url = $this->notice->getUrl();
         $suffix = ' ' . $url;
         $room = $this->maxLength() - mb_strlen($suffix) - (mb_strlen($pattern) - mb_strlen('%s'));
 
@@ -192,7 +192,7 @@ class FacebookShareTarget extends NoticeShareTarget
     public function targetUrl()
     {
         $args = array(
-            'u' => $this->notice->bestUrl(),
+            'u' => $this->notice->getUrl(),
             // TRANS: %s is notice content that is shared on Twitter, Facebook or another platform.
             't' => sprintf(_m('"%s"'), $this->notice->content),
         );
@@ -209,9 +209,9 @@ class FacebookShareTarget extends NoticeShareTarget
      *
      * @return boolean hook value
      */
-    function onPluginVersion(&$versions)
+    function onPluginVersion(array &$versions)
     {
-        $url = 'http://status.net/wiki/Plugin:ShareNotice';
+        $url = 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/ShareNotice';
 
         $versions[] = array('name' => 'ShareNotice',
             'version' => GNUSOCIAL_VERSION,