Merge commit 'refs/merge-requests/157' of git://gitorious.org/statusnet/mainline...

[quix0rs-gnu-social.git] / actions / userxrd.php

diff --git a/actions/userxrd.php b/actions/userxrd.php
index 1d888064d67f094af0625b78110ef17a270c2c6b..4ba7f91c7e0943cde39aa3ab1faa4241919ea356 100644 (file)
--- a/actions/userxrd.php
+++ b/actions/userxrd.php
@@ -30,6 +30,10 @@ class UserxrdAction extends XrdAction
     function prepare($args)
     {
         parent::prepare($args);
+        global $config;
+        if($config['site']['cors'] === true){
+            header('Access-Control-Allow-Origin: *');
+        }
 
         $this->uri = $this->trimmed('uri');
         $this->uri = self::normalize($this->uri);