X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=maintenance%2FcommandLine.inc;h=86a558d0e1068b987aff07636f1b43d888f74e31;hb=e34865144f3f21bb8b0ad4ba76d3d10490a73462;hp=3228ab15e497a2f44deb4348401350d9ec6fd9fa;hpb=9f5d06527c649911ba4dcbe1c42df728d76faabe;p=lhc%2Fweb%2Fwiklou.git diff --git a/maintenance/commandLine.inc b/maintenance/commandLine.inc index 3228ab15e4..86a558d0e1 100644 --- a/maintenance/commandLine.inc +++ b/maintenance/commandLine.inc @@ -21,7 +21,7 @@ * @ingroup Maintenance */ -require( dirname( __FILE__ ) . '/Maintenance.php' ); +require_once( __DIR__ . '/Maintenance.php' ); global $optionsWithArgs; if ( !isset( $optionsWithArgs ) ) { @@ -37,19 +37,13 @@ class CommandLineInc extends Maintenance { } } - public function getDbType() { - global $wgUseNormalUser; - - return ( isset( $wgUseNormalUser ) && $wgUseNormalUser ) ? - Maintenance::DB_STD : Maintenance::DB_ADMIN; - } - /** * No help, it would just be misleading since it misses custom options */ protected function maybeHelp( $force = false ) { - if ( !$force ) + if ( !$force ) { return; + } parent::maybeHelp( true ); } @@ -61,5 +55,5 @@ class CommandLineInc extends Maintenance { } $maintClass = 'CommandLineInc'; -require( DO_MAINTENANCE ); +require( RUN_MAINTENANCE_IF_MAIN );