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 "Treat the "temp" repo zone as private"
[lhc/web/wiklou.git]
/
maintenance
/
getConfiguration.php
diff --git
a/maintenance/getConfiguration.php
b/maintenance/getConfiguration.php
index
52cb209
..
d5f6834
100644
(file)
--- a/
maintenance/getConfiguration.php
+++ b/
maintenance/getConfiguration.php
@@
-63,7
+63,7
@@
class GetConfiguration extends Maintenance {
$format = strtolower( $this->getOption( 'format', 'PHP' ) );
$validFormat = in_array( $format, self::$outFormats );
$format = strtolower( $this->getOption( 'format', 'PHP' ) );
$validFormat = in_array( $format, self::$outFormats );
- if ( !
$validFormat ) {
+ if ( !$validFormat ) {
$this->error( "--format set to an unrecognized format", 0 );
$error_out = true;
}
$this->error( "--format set to an unrecognized format", 0 );
$error_out = true;
}
@@
-91,7
+91,7
@@
class GetConfiguration extends Maintenance {
if ( $this->regex ) {
$this->regex = '/' . $this->regex . '/';
if ( $this->hasOption( 'iregex' ) ) {
if ( $this->regex ) {
$this->regex = '/' . $this->regex . '/';
if ( $this->hasOption( 'iregex' ) ) {
- $this->regex .= 'i';
# case insensitive regex
+ $this->regex .= 'i'; # case insensitive regex
}
}
}
}
@@
-115,7
+115,7
@@
class GetConfiguration extends Maintenance {
$res = array();
# Sane default: dump any wg / wmg variable
$res = array();
# Sane default: dump any wg / wmg variable
- if ( !
$this->regex && !
$this->getOption( 'settings' ) ) {
+ if ( !
$this->regex && !
$this->getOption( 'settings' ) ) {
$this->regex = '/^wm?g/';
}
$this->regex = '/^wm?g/';
}
@@
-165,7
+165,7
@@
class GetConfiguration extends Maintenance {
protected function formatVarDump( $res ) {
$ret = '';
foreach ( $res as $key => $value ) {
protected function formatVarDump( $res ) {
$ret = '';
foreach ( $res as $key => $value ) {
- ob_start();
# intercept var_dump() output
+ ob_start(); # intercept var_dump() output
print "\${$key} = ";
var_dump( $value );
# grab var_dump() output and discard it from the output buffer
print "\${$key} = ";
var_dump( $value );
# grab var_dump() output and discard it from the output buffer
@@
-182,10
+182,12
@@
class GetConfiguration extends Maintenance {
return false;
}
}
return false;
}
}
+
return true;
} elseif ( is_scalar( $value ) ) {
return true;
}
return true;
} elseif ( is_scalar( $value ) ) {
return true;
}
+
return false;
}
}
return false;
}
}