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 4c9e9b8ae5cab2ce558f70975cab2e6b105961aa..5caf1960cbb1ae2970071ba62ff5df916230dc88 100644 (file)
--- a/actions/hostmeta.php
+++ b/actions/hostmeta.php
@@ -59,11 +59,13 @@ class HostMetaAction extends Action
             Event::handle('EndHostMetaLinks', array(&$xrd->links));
         }
 
-        global $config;
-        if($config['site']['cors'] === true){
+        // 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();
     }
 }