don't double the output for some PublicAction->extraHead

diff --git a/actions/public.php b/actions/public.php
index 7cae3cfd1513afdad9ccd0973d05de2ffbd15f41..175e0f1e70c416bb12fe4c00a47b631afc07cb66 100644 (file)
--- a/actions/public.php
+++ b/actions/public.php
@@ -74,19 +74,6 @@ class PublicAction extends SitestreamAction
         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()

diff --git a/lib/sitestreamaction.php b/lib/sitestreamaction.php
index aa1c2e1b0a3570edecd4488683757442b1a31887..d462c499a5f34bb8780d38e3eccb16ea710b715f 100644 (file)
--- a/lib/sitestreamaction.php
+++ b/lib/sitestreamaction.php
@@ -72,9 +72,6 @@ class SitestreamAction extends ManagedAction
     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