r75531 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r75530‎ | r75531 | r75532 >
Date:12:19, 27 October 2010
Author:demon
Status:ok
Tags:
Comment:
Remove unnecessary writable config dir check
Modified paths:
  • /trunk/phase3/includes/installer/Installer.i18n.php (modified) (history)
  • /trunk/phase3/includes/installer/Installer.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/installer/Installer.php
@@ -97,7 +97,6 @@
9898 'envCheckDiff3',
9999 'envCheckGraphics',
100100 'envCheckPath',
101 - 'envCheckWriteableDir',
102101 'envCheckExtension',
103102 'envCheckShellLocale',
104103 'envCheckUploadsDirectory',
@@ -658,26 +657,6 @@
659658 }
660659
661660 /**
662 - * Environment check for writable config/ directory.
663 - */
664 - public function envCheckWriteableDir() {
665 - $ipDir = $this->getVar( 'IP' );
666 - $configDir = $ipDir . '/config';
667 -
668 - if( !is_writeable( $configDir ) ) {
669 - $webserverGroup = self::maybeGetWebserverPrimaryGroup();
670 -
671 - if ( $webserverGroup !== null ) {
672 - $this->showMessage( 'config-dir-not-writable-group', $ipDir, $webserverGroup );
673 - } else {
674 - $this->showMessage( 'config-dir-not-writable-nogroup', $ipDir, $webserverGroup );
675 - }
676 -
677 - return false;
678 - }
679 - }
680 -
681 - /**
682661 * Environment check for setting the preferred PHP file extension.
683662 */
684663 public function envCheckExtension() {
Index: trunk/phase3/includes/installer/Installer.i18n.php
@@ -148,25 +148,6 @@
149149 'config-uri' => 'Script URI path: <code>$1</code>.',
150150 'config-no-uri' => "'''Error:''' Could not determine the current URI.
151151 Installation aborted.",
152 - 'config-dir-not-writable-group' => "'''Error:''' Cannot write config file.
153 -Installation aborted.
154 -
155 -The installer has determined the user your webserver is running as.
156 -Make the <code><nowiki>config</nowiki></code> directory writable by it to continue.
157 -On a Unix/Linux system:
158 -
159 -<pre>cd $1
160 -chgrp $2 config
161 -chmod g+w config</pre>",
162 - 'config-dir-not-writable-nogroup' => "'''Error:''' Cannot write config file.
163 -Installation aborted.
164 -
165 -The user your webserver is running as could not be determined.
166 -Make the <code><nowiki>config</nowiki></code> directory globally writable by it (and others!) to continue.
167 -On a Unix/Linux system do:
168 -
169 -<pre>cd $1
170 -chmod a+w config</pre>",
171152 'config-file-extension' => 'Installing MediaWiki with <code>$1</code> file extensions.',
172153 'config-shell-locale' => 'Detected shell locale "$1"',
173154 'config-uploads-safe' => 'The default directory for uploads is safe from arbitrary scripts execution.',

Status & tagging log