Followup r77883, rm the _ExternalHTTP stuff as well; cleans up IC msgs as well

diff --git a/includes/installer/CoreInstaller.php b/includes/installer/CoreInstaller.php
index 0ad8eb6..f4c76d2 100644 (file)
--- a/includes/installer/CoreInstaller.php
+++ b/includes/installer/CoreInstaller.php
@@ -83,7 +83,6 @@ abstract class CoreInstaller extends Installer {
                '_CCDone' => false,
                '_Extensions' => array(),
                '_MemCachedServers' => '',
-               '_ExternalHTTP' => false,
                '_LocalSettingsLocked' => true,
                '_UpgradeKey' => '',
        );

diff --git a/includes/installer/Installer.i18n.php b/includes/installer/Installer.i18n.php
index 9871bfc..bf0a061 100644 (file)
--- a/includes/installer/Installer.i18n.php
+++ b/includes/installer/Installer.i18n.php
@@ -35,8 +35,6 @@ Check your php.ini and make sure <code>session.save_path</code> is set to an app
        'config-your-language-help'       => 'Select a language to use during the installation process.',
        'config-wiki-language'            => 'Wiki language:',
        'config-wiki-language-help'       => 'Select the language that the wiki will predominantly be written in.',
-       'config-allow-requests'           => 'Allow external requests to MediaWiki.org',
-       'config-allow-requests-help'      => 'If enabled, allow the installer to check MediaWiki.org to make sure you are installing the latest stable version',
        'config-back'                     => '← Back',
        'config-continue'                 => 'Continue →',
        'config-page-language'            => 'Language',
@@ -423,13 +421,9 @@ Upload an image of the appropriate size, and enter the URL here.
 If you do not want a logo, leave this box blank.",
        'config-instantcommons'           => 'Enable Instant Commons',
        'config-instantcommons-help'      => '[http://www.mediawiki.org/wiki/InstantCommons Instant Commons] is a feature that allows wikis to use images, sounds and other media found on the [http://commons.wikimedia.org/ Wikimedia Commons] site.
-In order to do this, MediaWiki requires access to the Internet. $1
+In order to do this, MediaWiki requires access to the Internet.
 
-For more information on this feature, including instructions on how to set it up for wikis other than the Wikimedia Commons, consult [http://mediawiki.org/wiki/Manual:$wgForeignFileRepos the manual].', // $1 is for indicating whether or not we should be able to use the feature
-       'config-instantcommons-good'      => 'The installer was able to detect internet connectivity during the environment checks.
-You can enable this feature if you want to.',
-       'config-instantcommons-bad'       => '\'\'Unfortunately, the installer was unable to detect internet connectivity during the environment checks, so you might be unable to use this feature.
-If your server is behind a proxy, you may need to do some [http://www.mediawiki.org/wiki/Manual:$wgHTTPProxy additional configuration].\'\'',
+For more information on this feature, including instructions on how to set it up for wikis other than the Wikimedia Commons, consult [http://mediawiki.org/wiki/Manual:$wgForeignFileRepos the manual].',
        'config-cc-error'                 => 'The Creative Commons license chooser gave no result.
 Enter the license name manually.',
        'config-cc-again'                 => 'Pick again...',

diff --git a/includes/installer/WebInstallerPage.php b/includes/installer/WebInstallerPage.php
index 7118dab..0c383ec 100644 (file)
--- a/includes/installer/WebInstallerPage.php
+++ b/includes/installer/WebInstallerPage.php
@@ -201,7 +201,6 @@ class WebInstaller_Language extends WebInstallerPage {
                                if ( isset( $languages[$contLang] ) ) {
                                        $this->setVar( 'wgLanguageCode', $contLang );
                                }
-                               $this->setVar( '_ExternalHTTP', $r->getBool( 'config__ExternalHTTP' ) );
                                return 'continue';
                        }
                } elseif ( $this->parent->showSessionWarning ) {
@@ -222,14 +221,6 @@ class WebInstaller_Language extends WebInstallerPage {
                $s = Html::hidden( 'LanguageRequestTime', time() ) .
                        $this->getLanguageSelector( 'UserLang', 'config-your-language', $userLang, $this->parent->getHelpBox( 'config-your-language-help' ) ) .
                        $this->getLanguageSelector( 'ContLang', 'config-wiki-language', $contLang, $this->parent->getHelpBox( 'config-wiki-language-help' ) ) .
-                       $this->parent->getCheckBox(
-                               array(
-                                       'var' => '_ExternalHTTP',
-                                       'label' => 'config-allow-requests',
-                                   'help' => $this->parent->getHelpBox( 'config-allow-requests-help' )
-                               )
-                       );
-
                $this->addHTML( $s );
                $this->endForm();
        }
@@ -724,13 +715,11 @@ class WebInstaller_Options extends WebInstallerPage {
                            'help' => $this->parent->getHelpBox( 'config-logo-help' )
                        ) )
                );
-               $canUse = $this->getVar( '_ExternalHTTP' ) ?
-                       'config-instantcommons-good' : 'config-instantcommons-bad';
                $this->addHTML(
                        $this->parent->getCheckBox( array(
                                'var' => 'wgUseInstantCommons',
                                'label' => 'config-instantcommons',
-                           'help' => $this->parent->getHelpBox( 'config-instantcommons-help', wfMsgNoTrans( $canUse ) )
+                           'help' => $this->parent->getHelpBox( 'config-instantcommons-help' )
                        ) ) .
                        $this->getFieldSetEnd()
                );