| Index: trunk/phase3/includes/installer/CoreInstaller.php |
| — | — | @@ -83,7 +83,6 @@ |
| 84 | 84 | '_CCDone' => false, |
| 85 | 85 | '_Extensions' => array(), |
| 86 | 86 | '_MemCachedServers' => '', |
| 87 | | - '_ExternalHTTP' => false, |
| 88 | 87 | '_LocalSettingsLocked' => true, |
| 89 | 88 | '_UpgradeKey' => '', |
| 90 | 89 | ); |
| Index: trunk/phase3/includes/installer/Installer.i18n.php |
| — | — | @@ -35,8 +35,6 @@ |
| 36 | 36 | 'config-your-language-help' => 'Select a language to use during the installation process.', |
| 37 | 37 | 'config-wiki-language' => 'Wiki language:', |
| 38 | 38 | 'config-wiki-language-help' => 'Select the language that the wiki will predominantly be written in.', |
| 39 | | - 'config-allow-requests' => 'Allow external requests to MediaWiki.org', |
| 40 | | - 'config-allow-requests-help' => 'If enabled, allow the installer to check MediaWiki.org to make sure you are installing the latest stable version', |
| 41 | 39 | 'config-back' => '← Back', |
| 42 | 40 | 'config-continue' => 'Continue →', |
| 43 | 41 | 'config-page-language' => 'Language', |
| — | — | @@ -423,13 +421,9 @@ |
| 424 | 422 | If you do not want a logo, leave this box blank.", |
| 425 | 423 | 'config-instantcommons' => 'Enable Instant Commons', |
| 426 | 424 | '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. |
| 427 | | -In order to do this, MediaWiki requires access to the Internet. $1 |
| | 425 | +In order to do this, MediaWiki requires access to the Internet. |
| 428 | 426 | |
| 429 | | -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 |
| 430 | | - 'config-instantcommons-good' => 'The installer was able to detect internet connectivity during the environment checks. |
| 431 | | -You can enable this feature if you want to.', |
| 432 | | - '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. |
| 433 | | -If your server is behind a proxy, you may need to do some [http://www.mediawiki.org/wiki/Manual:$wgHTTPProxy additional configuration].\'\'', |
| | 427 | +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].', |
| 434 | 428 | 'config-cc-error' => 'The Creative Commons license chooser gave no result. |
| 435 | 429 | Enter the license name manually.', |
| 436 | 430 | 'config-cc-again' => 'Pick again...', |
| Index: trunk/phase3/includes/installer/WebInstallerPage.php |
| — | — | @@ -201,7 +201,6 @@ |
| 202 | 202 | if ( isset( $languages[$contLang] ) ) { |
| 203 | 203 | $this->setVar( 'wgLanguageCode', $contLang ); |
| 204 | 204 | } |
| 205 | | - $this->setVar( '_ExternalHTTP', $r->getBool( 'config__ExternalHTTP' ) ); |
| 206 | 205 | return 'continue'; |
| 207 | 206 | } |
| 208 | 207 | } elseif ( $this->parent->showSessionWarning ) { |
| — | — | @@ -222,14 +221,6 @@ |
| 223 | 222 | $s = Html::hidden( 'LanguageRequestTime', time() ) . |
| 224 | 223 | $this->getLanguageSelector( 'UserLang', 'config-your-language', $userLang, $this->parent->getHelpBox( 'config-your-language-help' ) ) . |
| 225 | 224 | $this->getLanguageSelector( 'ContLang', 'config-wiki-language', $contLang, $this->parent->getHelpBox( 'config-wiki-language-help' ) ) . |
| 226 | | - $this->parent->getCheckBox( |
| 227 | | - array( |
| 228 | | - 'var' => '_ExternalHTTP', |
| 229 | | - 'label' => 'config-allow-requests', |
| 230 | | - 'help' => $this->parent->getHelpBox( 'config-allow-requests-help' ) |
| 231 | | - ) |
| 232 | | - ); |
| 233 | | - |
| 234 | 225 | $this->addHTML( $s ); |
| 235 | 226 | $this->endForm(); |
| 236 | 227 | } |
| — | — | @@ -724,13 +715,11 @@ |
| 725 | 716 | 'help' => $this->parent->getHelpBox( 'config-logo-help' ) |
| 726 | 717 | ) ) |
| 727 | 718 | ); |
| 728 | | - $canUse = $this->getVar( '_ExternalHTTP' ) ? |
| 729 | | - 'config-instantcommons-good' : 'config-instantcommons-bad'; |
| 730 | 719 | $this->addHTML( |
| 731 | 720 | $this->parent->getCheckBox( array( |
| 732 | 721 | 'var' => 'wgUseInstantCommons', |
| 733 | 722 | 'label' => 'config-instantcommons', |
| 734 | | - 'help' => $this->parent->getHelpBox( 'config-instantcommons-help', wfMsgNoTrans( $canUse ) ) |
| | 723 | + 'help' => $this->parent->getHelpBox( 'config-instantcommons-help' ) |
| 735 | 724 | ) ) . |
| 736 | 725 | $this->getFieldSetEnd() |
| 737 | 726 | ); |