dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Make a single colon an invalid title in php and js"
[lhc/web/wiklou.git]
/
maintenance
/
commandLine.inc
diff --git
a/maintenance/commandLine.inc
b/maintenance/commandLine.inc
index
f57c0b6
..
be07142
100644
(file)
--- a/
maintenance/commandLine.inc
+++ b/
maintenance/commandLine.inc
@@
-21,7
+21,7
@@
* @ingroup Maintenance
*/
* @ingroup Maintenance
*/
-require
( dirname( __FILE__ ) . '/Maintenance.php' )
;
+require
_once __DIR__ . '/Maintenance.php'
;
global $optionsWithArgs;
if ( !isset( $optionsWithArgs ) ) {
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 ) {
/**
* No help, it would just be misleading since it misses custom options
*/
protected function maybeHelp( $force = false ) {
- if ( !$force )
+ if ( !$force )
{
return;
return;
+ }
parent::maybeHelp( true );
}
parent::maybeHelp( true );
}
@@
-61,5
+55,5
@@
class CommandLineInc extends Maintenance {
}
$maintClass = 'CommandLineInc';
}
$maintClass = 'CommandLineInc';
-require
( RUN_MAINTENANCE_IF_MAIN )
;
+require
RUN_MAINTENANCE_IF_MAIN
;