From: Tim Starling <tstarling@wikimedia.org>
Date: Wed, 21 Aug 2019 01:45:00 +0000 (+1000)
Subject: REST: Use ob_clean to wipe display_errors output
X-Git-Tag: 1.34.0-rc.0~645^2
X-Git-Url: http://git.cyclocoop.org/data/Fool?a=commitdiff_plain;h=645995f63e3dc4c6316825a8cf9eca2fcb363e40;p=lhc%2Fweb%2Fwiklou.git

REST: Use ob_clean to wipe display_errors output

As in the Action API

Change-Id: I48c3477f0ebb58c000fa832352a1631cfda6c909
---

diff --git a/includes/Rest/EntryPoint.php b/includes/Rest/EntryPoint.php
index a14c1a1294..ae01ae46ac 100644
--- a/includes/Rest/EntryPoint.php
+++ b/includes/Rest/EntryPoint.php
@@ -90,6 +90,9 @@ class EntryPoint {
 				$cookie['options'] );
 		}
 
+		// Clear all errors that might have been displayed if display_errors=On
+		ob_clean();
+
 		$stream = $response->getBody();
 		$stream->rewind();
 		if ( $stream instanceof CopyableStreamInterface ) {