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 62071ecccd471ede5e5b1f1aaef793c73088ce40..0ceeef98e8c1cf4f5e5e5a25f46d8733ad1cfd7a 100644 (file)
--- a/actions/public.php
+++ b/actions/public.php
@@ -165,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;
         }