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

2 files changed, 2 insertions, 2 deletions

diff --git a/lib/default.php b/lib/default.php
index 82b6910ab..95366e0b3 100644
--- a/lib/default.php
+++ b/lib/default.php
@@ -159,7 +159,7 @@ $default =
         array('default' => null,
               'welcome' => null),
         'snapshot' =>
-        array('run' => 'never',
+        array('run' => 'web',
               'frequency' => 10000,
               'reporturl' => 'http://status.net/stats/report'),
         'attachments' =>
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;
         }