Merge branch 'testing' of gitorious.org:statusnet/mainline into testing

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

diff --git a/actions/hostmeta.php b/actions/hostmeta.php
index 98c8a33ac986fde19069aac366d493cf8e90b2c1..5caf1960cbb1ae2970071ba62ff5df916230dc88 100644 (file)
--- a/actions/hostmeta.php
+++ b/actions/hostmeta.php
@@ -54,16 +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));
         }
 
-        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();
     }
 }