restore default behavior for Maintenance::output when no channel specified (channeled...

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 );
+               }
        }
 
        /**