From: Chad Horohoe <demon@users.mediawiki.org>
Date: Wed, 27 Oct 2010 12:19:56 +0000 (+0000)
Subject: Remove unnecessary writable config dir check
X-Git-Tag: 1.31.0-rc.0~34275
X-Git-Url: http://git.cyclocoop.org/ecrire?a=commitdiff_plain;h=edcbd2ecd095f56db68f712e5a939e3fda9b76b9;p=lhc%2Fweb%2Fwiklou.git

Remove unnecessary writable config dir check
---

diff --git a/includes/installer/Installer.i18n.php b/includes/installer/Installer.i18n.php
index 54d5177124..349d69353e 100644
--- a/includes/installer/Installer.i18n.php
+++ b/includes/installer/Installer.i18n.php
@@ -148,25 +148,6 @@ Image thumbnailing will be disabled.',
 	'config-uri'                      => 'Script URI path: <code>$1</code>.',
 	'config-no-uri'                   => "'''Error:''' Could not determine the current URI.
 Installation aborted.",
-	'config-dir-not-writable-group'   => "'''Error:''' Cannot write config file.
-Installation aborted.
-
-The installer has determined the user your webserver is running as.
-Make the <code><nowiki>config</nowiki></code> directory writable by it to continue.
-On a Unix/Linux system:
-
-<pre>cd $1
-chgrp $2 config
-chmod g+w config</pre>",
-	'config-dir-not-writable-nogroup'   => "'''Error:''' Cannot write config file.
-Installation aborted.
-
-The user your webserver is running as could not be determined.
-Make the <code><nowiki>config</nowiki></code> directory globally writable by it (and others!) to continue.
-On a Unix/Linux system do:
-
-<pre>cd $1
-chmod a+w config</pre>",
 	'config-file-extension'           => 'Installing MediaWiki with <code>$1</code> file extensions.',
 	'config-shell-locale'             => 'Detected shell locale "$1"',
 	'config-uploads-safe'             => 'The default directory for uploads is safe from arbitrary scripts execution.',
diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index 7bc71f3f96..2966ff7168 100644
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -97,7 +97,6 @@ abstract class Installer {
 		'envCheckDiff3',
 		'envCheckGraphics',
 		'envCheckPath',
-		'envCheckWriteableDir',
 		'envCheckExtension',
 		'envCheckShellLocale',
 		'envCheckUploadsDirectory',
@@ -657,26 +656,6 @@ abstract class Installer {
 		$this->showMessage( 'config-uri', $uri );
 	}
 
-	/**
-	 * Environment check for writable config/ directory.
-	 */
-	public function envCheckWriteableDir() {
-		$ipDir = $this->getVar( 'IP' );
-		$configDir = $ipDir . '/config';
-
-		if( !is_writeable( $configDir ) ) {
-			$webserverGroup = self::maybeGetWebserverPrimaryGroup();
-
-			if ( $webserverGroup !== null ) {
-				$this->showMessage( 'config-dir-not-writable-group', $ipDir, $webserverGroup );
-			} else {
-				$this->showMessage( 'config-dir-not-writable-nogroup', $ipDir, $webserverGroup );
-			}
-
-			return false;
-		}
-	}
-
 	/**
 	 * Environment check for setting the preferred PHP file extension.
 	 */