Network wide public feed auth check fix

diff --git a/actions/apitimelinenetworkpublic.php b/actions/apitimelinenetworkpublic.php
index a2039a3761b41924c02bac92be646b08c7460e73..957842600abd8ff8c238450d2c3ec84a1ed156a6 100644 (file)
--- a/actions/apitimelinenetworkpublic.php
+++ b/actions/apitimelinenetworkpublic.php
@@ -11,6 +11,9 @@ class ApiTimelineNetworkPublicAction extends ApiTimelinePublicAction
 
     protected function getStream()
     {
+        if (!$this->scoped instanceof Profile && common_config('public', 'localonly')) {
+            $this->clientError(_('Network wide public feed is not permitted without authorization'), 403);
+        }
         return new NetworkPublicNoticeStream($this->scoped);
     }
 }

diff --git a/actions/networkpublic.php b/actions/networkpublic.php
index 0948c35399be33100c45bda192a54aae8bfba331..79e642b773e0a13ef636a0fbe4e7fdf927538d09 100644 (file)
--- a/actions/networkpublic.php
+++ b/actions/networkpublic.php
@@ -7,7 +7,7 @@ class NetworkpublicAction extends PublicAction
     protected function streamPrepare()
     {
         if (!$this->scoped instanceof Profile && common_config('public', 'localonly')) {
-            $this->serverError(_('Network wide public feed is not permitted without authorization'), 403);
+            $this->clientError(_('Network wide public feed is not permitted without authorization'), 403);
         }
         if ($this->scoped instanceof Profile && $this->scoped->isLocal() && $this->scoped->getUser()->streamModeOnly()) {
             $this->stream = new NetworkPublicNoticeStream($this->scoped);