diff --git a/install.php b/install.php index f9d69262e2..a105e2e8c1 100644 --- a/install.php +++ b/install.php @@ -257,11 +257,6 @@ class WebInstaller extends Installer

Optional email address for the initial user (administrator)

-
  • - - -

    Release and security feed from update@status.net (recommended)

    -
  • @@ -333,7 +328,6 @@ STR; $this->adminPass = $post->string('admin_password'); $adminPass2 = $post->string('admin_password2'); $this->adminEmail = $post->string('admin_email'); - $this->adminUpdates = $post->string('admin_updates'); $this->siteProfile = $post->string('site_profile'); diff --git a/lib/installer.php b/lib/installer.php index 43d0507d8f..ed5bc540cf 100644 --- a/lib/installer.php +++ b/lib/installer.php @@ -47,7 +47,7 @@ abstract class Installer /** DB info */ public $host, $database, $dbtype, $username, $password, $db; /** Administrator info */ - public $adminNick, $adminPass, $adminEmail, $adminUpdates; + public $adminNick, $adminPass, $adminEmail; /** Should we skip writing the configuration file? */ public $skipConfig = false; @@ -520,19 +520,6 @@ abstract class Installer $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 ($this->adminUpdates && class_exists('Ostatus_profile')) { - try { - $oprofile = Ostatus_profile::ensureProfileURL('http://update.status.net/'); - Subscription::start($user->getProfile(), $oprofile->localProfile()); - $this->updateStatus("Set up subscription to update@status.net."); - } catch (Exception $e) { - $this->updateStatus("Could not set up subscription to update@status.net.", true); - } - } - return true; } diff --git a/plugins/DomainStatusNetwork/lib/domainstatusnetworkinstaller.php b/plugins/DomainStatusNetwork/lib/domainstatusnetworkinstaller.php index ad57e134d1..3780ff9e4f 100644 --- a/plugins/DomainStatusNetwork/lib/domainstatusnetworkinstaller.php +++ b/plugins/DomainStatusNetwork/lib/domainstatusnetworkinstaller.php @@ -133,7 +133,6 @@ class DomainStatusNetworkInstaller extends Installer $this->adminNick = null; $this->adminPass = null; $this->adminEmail = null; - $this->adminUpdates = null; /** Should we skip writing the configuration file? */ $this->skipConfig = true; diff --git a/scripts/install_cli.php b/scripts/install_cli.php index acdc38fabe..ac3fe3e657 100755 --- a/scripts/install_cli.php +++ b/scripts/install_cli.php @@ -84,7 +84,6 @@ class CliInstaller extends Installer '--admin-nick' => 'adminNick', '--admin-pass' => 'adminPass', '--admin-email' => 'adminEmail', - '--admin-updates' => 'adminUpdates', '--site-profile' => 'siteProfile' ); @@ -106,7 +105,6 @@ class CliInstaller extends Installer // defaults $this->dbtype = 'mysql'; - $this->adminUpdates = true; $this->verbose = true; // ssl is defaulted in lib/installer.php @@ -115,7 +113,7 @@ class CliInstaller extends Installer if (isset($map[$arg])) { $var = $map[$arg]; $this->$var = $option[1]; - if ($var == 'adminUpdates' || $arg == '--fancy') { + if ($arg == '--fancy') { $this->$var = ($option[1] != 'false') && ($option[1] != 'no'); } } else if ($arg == '--skip-config') {