From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Sun, 4 Apr 2010 18:33:57 +0000 (+0000)
Subject: $fname -> __METHOD__/__FUNCTION__
X-Git-Tag: 1.31.0-rc.0~37251
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/banques/?a=commitdiff_plain;h=0c0f5f6545044c2c78c4ef00fff7d639179ac5cf;p=lhc%2Fweb%2Fwiklou.git

$fname -> __METHOD__/__FUNCTION__
---

diff --git a/includes/Export.php b/includes/Export.php
index e8e74289ef..daeadc53b8 100644
--- a/includes/Export.php
+++ b/includes/Export.php
@@ -152,15 +152,14 @@ class WikiExporter {
 	# Not called by default (depends on $this->list_authors)
 	# Can be set by Special:Export when not exporting whole history
 	protected function do_list_authors( $page , $revision , $cond ) {
-		$fname = "do_list_authors" ;
-		wfProfileIn( $fname );
+		wfProfileIn( __METHOD__ );
 		$this->author_list = "<contributors>";
 		//rev_deleted
 		$nothidden = '('.$this->db->bitAnd('rev_deleted', Revision::DELETED_USER) . ') = 0';
 
 		$sql = "SELECT DISTINCT rev_user_text,rev_user FROM {$page},{$revision} 
 		WHERE page_id=rev_page AND $nothidden AND " . $cond ;
-		$result = $this->db->query( $sql, $fname );
+		$result = $this->db->query( $sql, __METHOD__ );
 		$resultset = $this->db->resultObject( $result );
 		while( $row = $resultset->fetchObject() ) {
 			$this->author_list .= "<contributor>" .
@@ -172,7 +171,7 @@ class WikiExporter {
 				"</id>" .
 				"</contributor>";
 		}
-		wfProfileOut( $fname );
+		wfProfileOut( __METHOD__ );
 		$this->author_list .= "</contributors>";
 	}
 
@@ -477,8 +476,7 @@ class XmlDumpWriter {
 	 * @access private
 	 */
 	function writeRevision( $row ) {
-		$fname = 'WikiExporter::dumpRev';
-		wfProfileIn( $fname );
+		wfProfileIn( __METHOD__ );
 
 		$out  = "    <revision>\n";
 		$out .= "      " . Xml::element( 'id', null, strval( $row->rev_id ) ) . "\n";
@@ -520,7 +518,7 @@ class XmlDumpWriter {
 
 		$out .= "    </revision>\n";
 
-		wfProfileOut( $fname );
+		wfProfileOut( __METHOD__ );
 		return $out;
 	}
 	
@@ -533,8 +531,7 @@ class XmlDumpWriter {
 	 * @access private
 	 */
 	function writeLogItem( $row ) {
-		$fname = 'WikiExporter::writeLogItem';
-		wfProfileIn( $fname );
+		wfProfileIn( __METHOD__ );
 
 		$out  = "    <logitem>\n";
 		$out .= "      " . Xml::element( 'id', null, strval( $row->log_id ) ) . "\n";
@@ -568,7 +565,7 @@ class XmlDumpWriter {
 
 		$out .= "    </logitem>\n";
 
-		wfProfileOut( $fname );
+		wfProfileOut( __METHOD__ );
 		return $out;
 	}
 
@@ -919,8 +916,7 @@ class DumpMultiWriter {
 }
 
 function xmlsafe( $string ) {
-	$fname = 'xmlsafe';
-	wfProfileIn( $fname );
+	wfProfileIn( __FUNCTION__ );
 
 	/**
 	 * The page may contain old data which has not been properly normalized.
@@ -930,6 +926,6 @@ function xmlsafe( $string ) {
 	$string = UtfNormal::cleanUp( $string );
 
 	$string = htmlspecialchars( $string );
-	wfProfileOut( $fname );
+	wfProfileOut( __FUNCTION__ );
 	return $string;
 }