Merge remote-tracking branch 'origin/1.0.x' into 1.0.x

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

diff --git a/actions/hostmeta.php b/actions/hostmeta.php
index 7093a441d75a9fd26e616c76496b7eb7335bfe2f..5caf1960cbb1ae2970071ba62ff5df916230dc88 100644 (file)
--- a/actions/hostmeta.php
+++ b/actions/hostmeta.php
@@ -54,12 +54,18 @@ class HostMetaAction extends Action
             $url = common_local_url('userxrd');
             $url.= '?uri={uri}';
             $xrd->links[] = array('rel' => Discovery::LRDD_REL,
-                                  'template' => $url,
-                                  'title' => array('Resource Descriptor'));
+                      'template' => $url,
+                      'title' => array('Resource Descriptor'));
             Event::handle('EndHostMetaLinks', array(&$xrd->links));
         }
 
+        // Output Cross-Origin Resource Sharing (CORS) header
+        if (common_config('discovery', 'cors')) {
+            header('Access-Control-Allow-Origin: *');
+        }
+
         header('Content-type: application/xrd+xml');
+
         print $xrd->toXML();
     }
 }