From 9db190c7e736ec8d063187d4241b59feaf7dc2d1 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Wed, 22 Jun 2011 11:28:20 +0200
Subject: update to MediaWiki 1.17.0

---
 includes/ProfilerStub.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'includes/ProfilerStub.php')

diff --git a/includes/ProfilerStub.php b/includes/ProfilerStub.php
index 100cb8df..e624e6f0 100644
--- a/includes/ProfilerStub.php
+++ b/includes/ProfilerStub.php
@@ -7,6 +7,7 @@
 
 /** backward compatibility */
 $wgProfiling = false;
+$wgProfiler = null;
 
 /** is setproctitle function available ? */
 $haveProctitle = function_exists( 'setproctitle' );
@@ -29,12 +30,15 @@ function wfProfileIn( $fn = '' ) {
  */
 function wfProfileOut( $fn = '' ) {
 	global $hackwhere, $wgDBname, $haveProctitle;
-	if( !$haveProctitle )
+	if( !$haveProctitle ) {
 		return;
-	if( count( $hackwhere ) )
+	}
+	if( count( $hackwhere ) ) {
 		array_pop( $hackwhere );
-	if( count( $hackwhere ) )
+	}
+	if( count( $hackwhere ) ) {
 		setproctitle( $hackwhere[count( $hackwhere )-1] . " [$wgDBname]" );
+	}
 }
 
 /**
-- 
cgit v1.2.3-54-g00ecf