Merge commit 'refs/merge-requests/29' of https://gitorious.org/social/mainline into...

[quix0rs-gnu-social.git] / scripts / install_cli.php

diff --git a/scripts/install_cli.php b/scripts/install_cli.php
index acdc38fabec70259d928ea3d6c03a7d42e1b6862..ac3fe3e6573125c8347054d70ea13c30f6cab70f 100755 (executable)
--- 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') {