Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fwriting to STDOUT -> print in Maintenance

Browse source 
Change-Id: I50dec90893a5dc88a5deabcc05a8c32058aca4c8
This commit is contained in:
Christian Aistleitner 2012-04-15 20:59:07 +02:00
parent d66a00d8f3
commit 0c33345146
1 changed files with 5 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
maintenance/Maintenance.php
View file

@ -320,11 +320,7 @@ abstract class Maintenance {
}
if ( $channel === null ) {
$this->cleanupChanneled();
if( php_sapi_name() == 'cli' ) {
fwrite( STDOUT, $out );
} else {
print( $out );
}
print( $out );
} else {
$out = preg_replace( '/\n\z/', '', $out );
$this->outputChanneled( $out, $channel );
@ -358,11 +354,7 @@ abstract class Maintenance {
*/
public function cleanupChanneled() {
if ( !$this->atLineStart ) {
if( php_sapi_name() == 'cli' ) {
fwrite( STDOUT, "\n" );
} else {
print "\n";
}
print "\n";
$this->atLineStart = true;
}
}
@ -381,31 +373,17 @@ abstract class Maintenance {
return;
}
$cli = php_sapi_name() == 'cli';
// End the current line if necessary
if ( !$this->atLineStart && $channel !== $this->lastChannel ) {
if( $cli ) {
fwrite( STDOUT, "\n" );
} else {
print "\n";
}
print "\n";
}
if( $cli ) {
fwrite( STDOUT, $msg );
} else {
print $msg;
}
print $msg;
$this->atLineStart = false;
if ( $channel === null ) {
// For unchanneled messages, output trailing newline immediately
if( $cli ) {
fwrite( STDOUT, "\n" );
} else {
print "\n";
}
print "\n";
$this->atLineStart = true;
}
$this->lastChannel = $channel;