Merge branch 'testing'

[quix0rs-gnu-social.git] / plugins / OStatus / actions / ownerxrd.php

diff --git a/plugins/OStatus/actions/ownerxrd.php b/plugins/OStatus/actions/ownerxrd.php
index 9c141d8c79692fce4947f5288ba06057dd7d1c2b..3f99e1cbd0d2c50df24bd06a5b54c506df47e70f 100644 (file)
--- a/plugins/OStatus/actions/ownerxrd.php
+++ b/plugins/OStatus/actions/ownerxrd.php
@@ -22,7 +22,9 @@
  * @maintainer James Walker <james@status.net>
  */
 
-if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) {
+    exit(1);
+}
 
 class OwnerxrdAction extends XrdAction
 {
@@ -32,15 +34,15 @@ class OwnerxrdAction extends XrdAction
     function prepare($args)
     {
         $this->user = User::siteOwner();
-        
+
         if (!$this->user) {
-            $this->clientError(_('No such user.'), 404);
+            $this->clientError(_m('No such user.'), 404);
             return false;
         }
 
         $nick = common_canonical_nickname($this->user->nickname);
         $acct = 'acct:' . $nick . '@' . common_config('site', 'server');
-        
+
         $this->xrd = new XRD();
 
         // Check to see if a $config['webfinger']['owner'] has been set