Merge branch 'testing' of gitorious.org:statusnet/mainline into testinglist0.9.0

* 'testing' of gitorious.org:statusnet/mainline:
  Updated note on geo location and added a note on user roles
  Set up subscription to update@status.net for admin user on new installation, if OStatus is set up and working. (Will fail gracefully on a behind-the-firewall site.)

1 files changed, 13 insertions, 0 deletions

diff --git a/install.php b/install.php
index bb53e2b55..8c9b6138b 100644
--- a/install.php
+++ b/install.php
@@ -865,6 +865,19 @@ function registerInitialUser($nickname, $password, $email)
     $user->grantRole('owner');
     $user->grantRole('moderator');
     $user->grantRole('administrator');
+    
+    // Attempt to do a remote subscribe to update@status.net
+    // Will fail if instance is on a private network.
+
+    if (class_exists('Ostatus_profile')) {
+        try {
+            $oprofile = Ostatus_profile::ensureProfile('http://update.status.net/');
+            Subscription::start($user->getProfile(), $oprofile->localProfile());
+            updateStatus("Set up subscription to <a href='http://update.status.net/'>update@status.net</a>.");
+        } catch (Exception $e) {
+            updateStatus("Could not set up subscription to <a href='http://update.status.net/'>update@status.net</a>.");
+        }
+    }
 
     return true;
 }