From: Brion Vibber <brion@pobox.com>
Date: Wed, 17 Feb 2010 18:14:08 +0000 (-0800)
Subject: Merge branch 'testing' into 0.9.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=5a6cbb248f8cdcb171ea5540e6a6c2eb10506a82;p=quix0rs-gnu-social.git

Merge branch 'testing' into 0.9.x
---

5a6cbb248f8cdcb171ea5540e6a6c2eb10506a82
diff --cc plugins/OStatus/OStatusPlugin.php
index a30f68cb36,b6c9fa1d4c..3686c0226d
--- a/plugins/OStatus/OStatusPlugin.php
+++ b/plugins/OStatus/OStatusPlugin.php
@@@ -286,7 -286,20 +286,20 @@@ class OStatusPlugin extends Plugi
      }
  
      function onEndShowStatusNetScripts($action) {
 -        $action->script(common_path('plugins/OStatus/js/ostatus.js'));
 +        $action->script('plugins/OStatus/js/ostatus.js');
          return true;
      }
+ 
+     function onStartNoticeSourceLink($notice, &$name, &$url, &$title)
+     {
+         if ($notice->source == 'ostatus') {
+             $bits = parse_url($notice->uri);
+             $domain = $bits['host'];
+ 
+             $name = $domain;
+             $url = $notice->uri;
+             $title = sprintf(_m("Sent from %s via OStatus"), $domain);
+             return false;
+         }
+     }
  }