From c1f9b1f7b1b77776192048005dcc66dcf3df2bfb Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sat, 27 Dec 2014 15:41:37 +0100
Subject: Update to MediaWiki 1.24.1

---
 includes/profiler/ProfilerSimpleText.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'includes/profiler/ProfilerSimpleText.php')

diff --git a/includes/profiler/ProfilerSimpleText.php b/includes/profiler/ProfilerSimpleText.php
index 1d57ea8d..0ee7aad2 100644
--- a/includes/profiler/ProfilerSimpleText.php
+++ b/includes/profiler/ProfilerSimpleText.php
@@ -31,7 +31,7 @@
  *
  * @ingroup Profiler
  */
-class ProfilerSimpleText extends ProfilerSimple {
+class ProfilerSimpleText extends ProfilerStandard {
 	public $visible = false; /* Show as <PRE> or <!-- ? */
 	static private $out;
 
@@ -42,6 +42,10 @@ class ProfilerSimpleText extends ProfilerSimple {
 		parent::__construct( $profileConfig );
 	}
 
+	protected function collateOnly() {
+		return true;
+	}
+
 	public function logData() {
 		if ( $this->mTemplated ) {
 			$this->close();
-- 
cgit v1.2.2