Merge branch 'archwiki'

# Conflicts:
#	skins/ArchLinux.php
#	skins/ArchLinux/archlogo.gif

1 files changed, 5 insertions, 1 deletions

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();