From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Sat, 7 Nov 2009 14:23:09 +0000 (+0000)
Subject: $fname -> __METHOD__
X-Git-Tag: 1.31.0-rc.0~38916
X-Git-Url: http://git.cyclocoop.org/ecrire?a=commitdiff_plain;h=2d0dd7959c4450692e27374401158f87c91254e0;p=lhc%2Fweb%2Fwiklou.git

$fname -> __METHOD__
---

diff --git a/includes/ProxyTools.php b/includes/ProxyTools.php
index f76e24fb5d..a0ee5ca8e0 100644
--- a/includes/ProxyTools.php
+++ b/includes/ProxyTools.php
@@ -195,12 +195,11 @@ function wfParseCIDR( $range ) {
  */
 function wfIsLocallyBlockedProxy( $ip ) {
 	global $wgProxyList;
-	$fname = 'wfIsLocallyBlockedProxy';
 
 	if ( !$wgProxyList ) {
 		return false;
 	}
-	wfProfileIn( $fname );
+	wfProfileIn( __METHOD__ );
 
 	if ( !is_array( $wgProxyList ) ) {
 		# Load from the specified file
@@ -217,7 +216,7 @@ function wfIsLocallyBlockedProxy( $ip ) {
 	} else {
 		$ret = false;
 	}
-	wfProfileOut( $fname );
+	wfProfileOut( __METHOD__ );
 	return $ret;
 }
 
diff --git a/includes/SiteStats.php b/includes/SiteStats.php
index 0a7359b9ac..16e3c5f285 100644
--- a/includes/SiteStats.php
+++ b/includes/SiteStats.php
@@ -204,7 +204,6 @@ class SiteStatsUpdate {
 	}
 
 	function doUpdate() {
-		$fname = 'SiteStatsUpdate::doUpdate';
 		$dbw = wfGetDB( DB_MASTER );
 
 		$updates = '';
@@ -221,7 +220,7 @@ class SiteStatsUpdate {
 
 			# Need a separate transaction because this a global lock
 			$dbw->begin();
-			$dbw->query( $sql, $fname );
+			$dbw->query( $sql, __METHOD__ );
 			$dbw->commit();
 		}
 	}