r63706 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r63705‎ | r63706 | r63707 >
Date:20:44, 13 March 2010
Author:maxsem
Status:ok
Tags:
Comment:
Don't ask for wgSqliteDataDirMode on Windows
Modified paths:
  • /branches/new-installer/phase3/includes/installer/SqliteInstaller.php (modified) (history)

Diff [purge]

Index: branches/new-installer/phase3/includes/installer/SqliteInstaller.php
@@ -33,13 +33,15 @@
3434 }
3535
3636 function getConnectForm() {
37 - return
38 - $this->getTextBox( 'wgSQLiteDataDir', 'config-sqlite-dir' ) .
 37+ $s = $this->getTextBox( 'wgSQLiteDataDir', 'config-sqlite-dir' ) .
3938 $this->parent->getHelpBox( 'config-sqlite-dir-help' ) .
4039 $this->getTextBox( 'wgDBname', 'config-db-name' ) .
41 - $this->parent->getHelpBox( 'config-sqlite-name-help' ) .
42 - $this->getTextBox( 'wgSQLiteDataDirMode', 'config-sqlite-permissions' ) .
43 - $this->parent->getHelpBox( 'config-sqlite-permissions-help' );
 40+ $this->parent->getHelpBox( 'config-sqlite-name-help' );
 41+ if ( !wfIsWindows() ) {
 42+ $s .= $this->getTextBox( 'wgSQLiteDataDirMode', 'config-sqlite-permissions' ) .
 43+ $this->parent->getHelpBox( 'config-sqlite-permissions-help' );
 44+ }
 45+ return $s;
4446 }
4547
4648 function submitConnectForm() {

Status & tagging log