Merge commit 'f6d65'

# Conflicts:
#	skins/ArchLinux/ArchLinux.php

1 files changed, 4 insertions, 21 deletions

diff --git a/includes/profiler/ProfilerStub.php b/includes/profiler/ProfilerStub.php
index 1d3b65d2..244b4e4b 100644
--- a/includes/profiler/ProfilerStub.php
+++ b/includes/profiler/ProfilerStub.php
@@ -27,18 +27,11 @@
  * @ingroup Profiler
  */
 class ProfilerStub extends Profiler {
-	public function isStub() {
-		return true;
+	public function scopedProfileIn( $section ) {
+		return null; // no-op
 	}
 
-	public function isPersistent() {
-		return false;
-	}
-
-	public function profileIn( $fn ) {
-	}
-
-	public function profileOut( $fn ) {
+	public function getFunctionStats() {
 	}
 
 	public function getOutput() {
@@ -47,20 +40,10 @@ class ProfilerStub extends Profiler {
 	public function close() {
 	}
 
-	public function logData() {
-	}
-
 	public function getCurrentSection() {
 		return '';
 	}
 
-	public function transactionWritingIn( $server, $db, $id = '' ) {
-	}
-
-	public function transactionWritingOut( $server, $db, $id = '' ) {
-	}
-
-	public function getRawData() {
-		return array();
+	public function logData() {
 	}
 }