Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x

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

diff --git a/actions/inbox.php b/actions/inbox.php
index f5f7d8bcb104a15d88ff1a69c908a70930fe925c..f605cc9e8b3edf6d246c0febc68f716bf3e49384 100644 (file)
--- a/actions/inbox.php
+++ b/actions/inbox.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
@@ -56,7 +56,7 @@ class InboxAction extends MailboxAction
     function title()
     {
         if ($this->page > 1) {
-            return sprintf(_("Inbox for %s - page %d"), $this->user->nickname,
+            return sprintf(_("Inbox for %1$s - page %2$d"), $this->user->nickname,
                 $this->page);
         } else {
             return sprintf(_("Inbox for %s"), $this->user->nickname);