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

[quix0rs-gnu-social.git] / plugins / WebFinger / lib / xrdaction.php

diff --git a/plugins/WebFinger/lib/xrdaction.php b/plugins/WebFinger/lib/xrdaction.php
index 5089ad44e0280e7ac1c1933d81634cb3571abda7..1ac5764dc5e147eaa58909d5cc7aef55f1e4a910 100644 (file)
--- a/plugins/WebFinger/lib/xrdaction.php
+++ b/plugins/WebFinger/lib/xrdaction.php
@@ -25,17 +25,15 @@
 
 if (!defined('GNUSOCIAL')) { exit(1); }
 
-abstract class XrdAction extends Action
+abstract class XrdAction extends ManagedAction
 {
     // json or xml for now, this may still be overriden because of
     // our back-compatibility with StatusNet <=1.1.1
     protected $defaultformat = null;
 
-    protected $resource = null;
-    protected $target   = null;
     protected $xrd      = null;
 
-    public function isReadOnly($args)
+    public function isReadOnly(array $args=array())
     {
         return true;
     }
@@ -61,15 +59,13 @@ abstract class XrdAction extends Action
 
     protected function handle()
     {
-        parent::handle();
-
         $this->setXRD();
 
         if (common_config('discovery', 'cors')) {
             header('Access-Control-Allow-Origin: *');
         }
 
-        $this->showPage();
+        parent::handle();
     }
 
     public function mimeType()