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

1 files changed, 10 insertions, 0 deletions

diff --git a/actions/public.php b/actions/public.php
index c2e90c3b5..395d28819 100644
--- a/actions/public.php
+++ b/actions/public.php
@@ -209,4 +209,14 @@ class PublicAction extends Action
         $feat = new FeaturedUsersSection($this);
         $feat->show();
     }
+
+    function showAnonymousMessage()
+    {
+		$m = _('This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service ' .
+               'based on the Free Software [Laconica](http://laconi.ca/) tool. ' .
+               '[Join now](%%action.register%%) to share notices about yourself with friends, family, and colleagues! ([Read more](%%doc.help%%))');
+        $this->elementStart('p', 'anonymous');
+        $this->raw(common_markup_to_html($m));
+        $this->elementEnd('p');
+    }
 }