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
Fix warning "ob_end_flush(): failed to delete and flush buffer" during uploads
[lhc/web/wiklou.git]
/
includes
/
filerepo
/
FileRepo.php
diff --git
a/includes/filerepo/FileRepo.php
b/includes/filerepo/FileRepo.php
index
e430bc8
..
0c37d78
100644
(file)
--- a/
includes/filerepo/FileRepo.php
+++ b/
includes/filerepo/FileRepo.php
@@
-1634,7
+1634,11
@@
class FileRepo {
$status = $this->newGood();
$status->merge( $this->backend->streamFile( $params ) );
$status = $this->newGood();
$status->merge( $this->backend->streamFile( $params ) );
- ob_end_flush();
+ // T186565: Close the buffer, unless it has already been closed
+ // in HTTPFileStreamer::resetOutputBuffers().
+ if ( ob_get_status() ) {
+ ob_end_flush();
+ }
return $status;
}
return $status;
}