Merge branch '1.0.x' into schema-x

[quix0rs-gnu-social.git] / lib / mailbox.php

diff --git a/lib/mailbox.php b/lib/mailbox.php
index e1d384a0635207d97e9c04c1482f8d6fa65e05a7..2b00f5ffde0538f908fd7af15d4cf7d22c0697fc 100644 (file)
--- a/lib/mailbox.php
+++ b/lib/mailbox.php
@@ -224,6 +224,7 @@ class MailboxAction extends CurrentUserDesignAction
 
         if ($message->source) {
             $this->elementStart('span', 'source');
+            // FIXME: bad i18n. Device should be a parameter (from %s).
             $this->text(_('from'));
             $this->element('span', 'device', $this->showSource($message->source));
             $this->elementEnd('span');
@@ -282,7 +283,7 @@ class MailboxAction extends CurrentUserDesignAction
                                     $ns->name);
                 $this->elementEnd('span');
             } else {
-                $this->out->element('span', 'device', $source_name);
+                $this->element('span', 'device', $source_name);
             }
             break;
         }