Merge branch 'master' of /var/www/trunk

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

diff --git a/actions/public.php b/actions/public.php
index 76e922dff1efea0cc734d46df741f0029c27c5f0..0ceeef98e8c1cf4f5e5e5a25f46d8733ad1cfd7a 100644 (file)
--- a/actions/public.php
+++ b/actions/public.php
@@ -33,6 +33,7 @@ if (!defined('LACONICA')) {
 
 require_once INSTALLDIR.'/lib/publicgroupnav.php';
 require_once INSTALLDIR.'/lib/noticelist.php';
+require_once INSTALLDIR.'/lib/feedlist.php';
 
 /**
  * Action for displaying the public stream
@@ -164,7 +165,7 @@ class PublicAction extends Action
                                        NOTICES_PER_PAGE + 1);
 
         if (!$notice) {
-            $this->server_error(_('Could not retrieve public stream.'));
+            $this->serverError(_('Could not retrieve public stream.'));
             return;
         }