r65696 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r65695‎ | r65696 | r65697 >
Date:16:12, 30 April 2010
Author:avar
Status:ok
Tags:
Comment:
Fix one-dir off error with the envCheckWriteableDir check

The config-dir-not-writable message excepts $IP, not $IP/config.

Before it would tell you to:

cd /home/avar/src/mw-git/new-installer/phase3/config
chmod a+w config

Which didn't make sense since you were already in the config
directory. Now it says this, as in the old installer:

cd /home/avar/src/mw-git/new-installer/phase3
chmod a+w config
Modified paths:
  • /branches/new-installer/phase3/includes/installer/Installer.php (modified) (history)

Diff [purge]

Index: branches/new-installer/phase3/includes/installer/Installer.php
@@ -608,9 +608,10 @@
609609
610610 /** Environment check for writable config/ directory */
611611 function envCheckWriteableDir() {
612 - $configDir = $this->getVar( 'IP' ) . '/config';
 612+ $ipDir = $this->getVar( 'IP' );
 613+ $configDir = $ipDir . '/config';
613614 if( !is_writeable( $configDir ) ) {
614 - $this->showMessage( 'config-dir-not-writable', $configDir );
 615+ $this->showMessage( 'config-dir-not-writable', $ipDir );
615616 return false;
616617 }
617618 }

Status & tagging log