PleaseStand has uploaded a new change for review.
https://gerrit.wikimedia.org/r/89498
Change subject: Revert installer changes from e9e24cbfe78
......................................................................
Revert installer changes from e9e24cbfe78
I realized the installer never actually saved $wgGitBin to
LocalSettings.php because no change to LocalSettingsGenerator
was made, and I was just going to add the variable there.
However, the more I think about it, the more I believe $wgGitBin
should not have been added to the installer in the first place.
It currently exists only for a very minor feature (showing commit
dates on Special:Version). In contrast, diff3 and ImageMagick are
necessary for features most users consider to be very important:
automatic edit merging and good-quality image scaling.
So including the variable in LocalSettings.php only serves to increase
the file's size without a clear benefit for most users. If you really
want to use a non-default $wgGitBin, add the variable manually:
echo \$wgGitBin = "'$(which git)';" >> LocalSettings.php
Apologies to the 19 translators whose translations of the related
messages will not be used in the MediaWiki 1.22 tarball release.
Change-Id: I04611a42b72e89919f98c918691a0f08be9e13a9
---
M includes/installer/Installer.i18n.php
M includes/installer/Installer.php
2 files changed, 0 insertions(+), 27 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/98/89498/1
diff --git a/includes/installer/Installer.i18n.php
b/includes/installer/Installer.i18n.php
index b3cd019..ba347f8 100644
--- a/includes/installer/Installer.i18n.php
+++ b/includes/installer/Installer.i18n.php
@@ -146,8 +146,6 @@
'config-mod-security' => "'''Warning:''' Your web server
has [http://modsecurity.org/ mod_security] enabled. If misconfigured, it can
cause problems for MediaWiki or other software that allows users to post
arbitrary content.
Refer to [http://modsecurity.org/documentation/ mod_security documentation] or
contact your host's support if you encounter random errors.",
'config-diff3-bad' => 'GNU diff3 not found.',
- 'config-git' => 'Found the Git version control
software: <code>$1</code>.',
- 'config-git-bad' => 'Git version control software not
found.',
'config-imagemagick' => 'Found ImageMagick:
<code>$1</code>.
Image thumbnailing will be enabled if you enable uploads.',
'config-gd' => 'Found GD graphics library
built-in.
diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index 5eaacf8..fde8250 100644
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -121,7 +121,6 @@
'envCheckModSecurity',
'envCheckDiff3',
'envCheckGraphics',
- 'envCheckGit',
'envCheckServer',
'envCheckPath',
'envCheckExtension',
@@ -156,7 +155,6 @@
'wgDBtype',
'wgDiff3',
'wgImageMagickConvertCommand',
- 'wgGitBin',
'IP',
'wgScriptPath',
'wgScriptExtension',
@@ -946,29 +944,6 @@
$this->showMessage( 'config-gd' );
} else {
$this->showMessage( 'config-no-scaling' );
- }
-
- return true;
- }
-
- /**
- * Search for git.
- *
- * @since 1.22
- * @return bool
- */
- protected function envCheckGit() {
- $names = array( wfIsWindows() ? 'git.exe' : 'git' );
- $versionInfo = array( '$1 --version', 'git version' );
-
- $git = self::locateExecutableInDefaultPaths( $names,
$versionInfo );
-
- if ( $git ) {
- $this->setVar( 'wgGitBin', $git );
- $this->showMessage( 'config-git', $git );
- } else {
- $this->setVar( 'wgGitBin', false );
- $this->showMessage( 'config-git-bad' );
}
return true;
--
To view, visit https://gerrit.wikimedia.org/r/89498
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I04611a42b72e89919f98c918691a0f08be9e13a9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: PleaseStand <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
