jenkins-bot has submitted this change and it was merged.

Change subject: Don't use flush(), it interferes with output buffers
......................................................................


Don't use flush(), it interferes with output buffers

Change-Id: I4262bebf04c90e9c2ee0d31cba2a9c83fc6b870b
---
M repo/includes/specials/SpecialEntityData.php
1 file changed, 2 insertions(+), 3 deletions(-)

Approvals:
  Tobias Gritschacher: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/repo/includes/specials/SpecialEntityData.php 
b/repo/includes/specials/SpecialEntityData.php
index ffd7843..a0d07d4 100755
--- a/repo/includes/specials/SpecialEntityData.php
+++ b/repo/includes/specials/SpecialEntityData.php
@@ -631,12 +631,11 @@
                $response->header( 'Cache-Control: ' . $mode . ', s-maxage=' . 
$smaxage . ', max-age=' . $maxage );
 
                $this->getOutput()->disable(); // don't generate HTML
-               ob_clean();
+               ob_clean(); // remove anything that might already be in the 
output buffer.
 
                print $data;
-               flush();
 
-               //die(); //FIXME: figure out how to best shut down here.
+               // exit normally here, keeping all levels of output buffering.
        }
 
        /**

-- 
To view, visit https://gerrit.wikimedia.org/r/64274
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I4262bebf04c90e9c2ee0d31cba2a9c83fc6b870b
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Daniel Kinzler <daniel.kinz...@wikimedia.de>
Gerrit-Reviewer: Aude <aude.w...@gmail.com>
Gerrit-Reviewer: Daniel Kinzler <daniel.kinz...@wikimedia.de>
Gerrit-Reviewer: Tobias Gritschacher <tobias.gritschac...@wikimedia.de>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to