XrdAction extends ManagedAction

This commit is contained in:
Mikael Nordfeldth 2014-05-17 15:14:34 +02:00
parent 1945a3152e
commit c6ba545697

View File

@ -25,7 +25,7 @@
if (!defined('GNUSOCIAL')) { exit(1); } 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 // json or xml for now, this may still be overriden because of
// our back-compatibility with StatusNet <=1.1.1 // our back-compatibility with StatusNet <=1.1.1
@ -59,15 +59,13 @@ abstract class XrdAction extends Action
protected function handle() protected function handle()
{ {
parent::handle();
$this->setXRD(); $this->setXRD();
if (common_config('discovery', 'cors')) { if (common_config('discovery', 'cors')) {
header('Access-Control-Allow-Origin: *'); header('Access-Control-Allow-Origin: *');
} }
$this->showPage(); parent::handle();
} }
public function mimeType() public function mimeType()