$dbpassfile = $this->getOption( 'dbpassfile', false );
if ( $dbpassfile !== false ) {
+ if ( $this->getOption( 'dbpass', false ) !== false ) {
+ $this->error( 'WARNING: You provide the options "dbpass" and "dbpassfile". The content of "dbpassfile" overwrites "dbpass".' );
+ }
wfSuppressWarnings();
$dbpass = file_get_contents( $dbpassfile );
wfRestoreWarnings();
$passfile = $this->getOption( 'passfile', false );
if ( $passfile !== false ) {
+ if ( $this->getOption( 'pass', false ) !== false ) {
+ $this->error( 'WARNING: You provide the options "pass" and "passfile". The content of "passfile" overwrites "pass".' );
+ }
wfSuppressWarnings();
$pass = file_get_contents( $passfile );
wfRestoreWarnings();
}
$this->mOptions['pass'] = str_replace( array( "\n", "\r" ), "", $pass );
} elseif ( $this->getOption( 'pass', false ) === false ) {
- $this->error( "You need to provide the option pass or passfile", true );
+ $this->error( 'You need to provide the option "pass" or "passfile"', true );
}
$installer =