Merge branch 'master' into 'nightly'

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

diff --git a/actions/public.php b/actions/public.php
index 7cae3cfd1513afdad9ccd0973d05de2ffbd15f41..000f82cb93d5e96b49609cf01676326e9aec6ae3 100644 (file)
--- a/actions/public.php
+++ b/actions/public.php
@@ -39,7 +39,6 @@ if (!defined('GNUSOCIAL')) { exit(1); }
  * @link     http://status.net/
  *
  * @see      PublicrssAction
- * @see      PublicxrdsAction
  */
 class PublicAction extends SitestreamAction
 {
@@ -69,26 +68,6 @@ class PublicAction extends SitestreamAction
         }
     }
 
-    function extraHead()
-    {
-        parent::extraHead();
-        $this->element('meta', array('http-equiv' => 'X-XRDS-Location',
-                                           'content' => common_local_url('publicxrds')));
-
-        $rsd = common_local_url('rsd');
-
-        // RSD, http://tales.phrasewise.com/rfc/rsd
-
-        $this->element('link', array('rel' => 'EditURI',
-                                     'type' => 'application/rsd+xml',
-                                     'href' => $rsd));
-
-        if ($this->page != 1) {
-            $this->element('link', array('rel' => 'canonical',
-                                         'href' => common_local_url('public')));
-        }
-    }
-
     function showSections()
     {
         // Show invite button, as long as site isn't closed, and