Merge remote-tracking branch 'upstream/master'

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

diff --git a/actions/networkpublic.php b/actions/networkpublic.php
index 7baa313bee3313a0e68274090e3d53ed2c641671..41c4e37e3cd41cce1db97872a390fc79f4ba3471 100644 (file)
--- a/actions/networkpublic.php
+++ b/actions/networkpublic.php
@@ -2,7 +2,7 @@
 
 if (!defined('GNUSOCIAL')) { exit(1); }
 
-class NetworkpublicAction extends PublicAction
+class NetworkpublicAction extends SitestreamAction
 {
     protected function streamPrepare()
     {
@@ -28,13 +28,6 @@ class NetworkpublicAction extends PublicAction
         }
     }
 
-    function extraHead()
-    {
-        // the PublicAction has some XRDS stuff that might be unique to the non-network public feed
-        // FIXME: Solve this with a call that doesn't rely on parent:: and is unique for each class.
-        ManagedAction::extraHead();
-    }
-
     function showSections()
     {
         // Show invite button, as long as site isn't closed, and