dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
82039b5
)
restore default behavior for Maintenance::output when no channel specified (channeled...
author
Ariel Glenn
<ariel@users.mediawiki.org>
Fri, 4 Jun 2010 01:43:56 +0000
(
01:43
+0000)
committer
Ariel Glenn
<ariel@users.mediawiki.org>
Fri, 4 Jun 2010 01:43:56 +0000
(
01:43
+0000)
maintenance/Maintenance.php
patch
|
blob
|
history
diff --git
a/maintenance/Maintenance.php
b/maintenance/Maintenance.php
index
dc33be5
..
3614adf
100644
(file)
--- a/
maintenance/Maintenance.php
+++ b/
maintenance/Maintenance.php
@@
-223,8
+223,15
@@
abstract class Maintenance {
if ( $this->mQuiet ) {
return;
}
- $out = preg_replace( '/\n\z/', '', $out );
- $this->outputChanneled( $out, $channel );
+ if ( $channel === null ) {
+ $f = fopen( 'php://stdout', 'w' );
+ fwrite( $f, $out );
+ fclose( $f );
+ }
+ else {
+ $out = preg_replace( '/\n\z/', '', $out );
+ $this->outputChanneled( $out, $channel );
+ }
}
/**