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 "mediawiki.util: Remove outdated comment from unit test"
[lhc/web/wiklou.git]
/
maintenance
/
getConfiguration.php
diff --git
a/maintenance/getConfiguration.php
b/maintenance/getConfiguration.php
index
1db53f3
..
5838201
100644
(file)
--- a/
maintenance/getConfiguration.php
+++ b/
maintenance/getConfiguration.php
@@
-87,7
+87,7
@@
class GetConfiguration extends Maintenance {
public function finalSetup() {
parent::finalSetup();
public function finalSetup() {
parent::finalSetup();
- $this->regex = $this->getOption( 'regex' ) ?
: $this->getOption( 'iregex' );
+ $this->regex = $this->getOption( 'regex' ) ?: $this->getOption( 'iregex' );
if ( $this->regex ) {
$this->regex = '/' . $this->regex . '/';
if ( $this->hasOption( 'iregex' ) ) {
if ( $this->regex ) {
$this->regex = '/' . $this->regex . '/';
if ( $this->hasOption( 'iregex' ) ) {
@@
-184,7
+184,7
@@
class GetConfiguration extends Maintenance {
}
return true;
}
return true;
- } elseif ( is_scalar( $value ) ) {
+ } elseif ( is_scalar( $value )
|| $value === null
) {
return true;
}
return true;
}