diff options
| author | Evan Prodromou <evan@status.net> | 2009-11-17 08:04:14 -0500 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2009-11-17 08:04:14 -0500 |
| commit | bac2d80c919a78d5cafd57f712872a90cda04847 (patch) | |
| tree | d2df10a582edc0bf9e043f1c764953a290927678 /lib/mailbox.php | |
| parent | 9a1a83e8ebe5ad39838e6363f1537a1a5232b9cb (diff) | |
| parent | 6a1afda259c5223449f679a64f932e36df5ebe39 (diff) | |
Merge branch '0.9.x' into adminpanel
Conflicts:
classes/User.php
Diffstat (limited to 'lib/mailbox.php')
| -rw-r--r-- | lib/mailbox.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/mailbox.php b/lib/mailbox.php index e1d384a06..90a58b4c4 100644 --- a/lib/mailbox.php +++ b/lib/mailbox.php @@ -282,7 +282,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; } |