From fe18063bd2bb00ac67d4afc038850cd3a7a63189 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sat, 14 Nov 2009 17:38:10 +0100
Subject: Revert "Ask users if they wish to send statistics to SNI, default is
 off."

This reverts commit 7efea1115f45b8880fe3161cc32b09510ddd2264.

Conflicts:

	install.php
---
 lib/default.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

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' =>
-- 
cgit v1.2.3-54-g00ecf


From 133ca0ef6b13d4d693c2e03b831cc75517f89227 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Sat, 14 Nov 2009 13:10:47 -0800
Subject: Fix regression from 9f372da3da4bd445175eda9155fa7fdd13d3c85e: typo in
 refactoring caused fatal error on unrecognized message source

---
 lib/mailbox.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

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;
         }
-- 
cgit v1.2.3-54-g00ecf