| Index: trunk/phase3/includes/Export.php |
| — | — | @@ -152,15 +152,14 @@ |
| 153 | 153 | # Not called by default (depends on $this->list_authors) |
| 154 | 154 | # Can be set by Special:Export when not exporting whole history |
| 155 | 155 | protected function do_list_authors( $page , $revision , $cond ) { |
| 156 | | - $fname = "do_list_authors" ; |
| 157 | | - wfProfileIn( $fname ); |
| | 156 | + wfProfileIn( __METHOD__ ); |
| 158 | 157 | $this->author_list = "<contributors>"; |
| 159 | 158 | //rev_deleted |
| 160 | 159 | $nothidden = '('.$this->db->bitAnd('rev_deleted', Revision::DELETED_USER) . ') = 0'; |
| 161 | 160 | |
| 162 | 161 | $sql = "SELECT DISTINCT rev_user_text,rev_user FROM {$page},{$revision} |
| 163 | 162 | WHERE page_id=rev_page AND $nothidden AND " . $cond ; |
| 164 | | - $result = $this->db->query( $sql, $fname ); |
| | 163 | + $result = $this->db->query( $sql, __METHOD__ ); |
| 165 | 164 | $resultset = $this->db->resultObject( $result ); |
| 166 | 165 | while( $row = $resultset->fetchObject() ) { |
| 167 | 166 | $this->author_list .= "<contributor>" . |
| — | — | @@ -172,7 +171,7 @@ |
| 173 | 172 | "</id>" . |
| 174 | 173 | "</contributor>"; |
| 175 | 174 | } |
| 176 | | - wfProfileOut( $fname ); |
| | 175 | + wfProfileOut( __METHOD__ ); |
| 177 | 176 | $this->author_list .= "</contributors>"; |
| 178 | 177 | } |
| 179 | 178 | |
| — | — | @@ -477,8 +476,7 @@ |
| 478 | 477 | * @access private |
| 479 | 478 | */ |
| 480 | 479 | function writeRevision( $row ) { |
| 481 | | - $fname = 'WikiExporter::dumpRev'; |
| 482 | | - wfProfileIn( $fname ); |
| | 480 | + wfProfileIn( __METHOD__ ); |
| 483 | 481 | |
| 484 | 482 | $out = " <revision>\n"; |
| 485 | 483 | $out .= " " . Xml::element( 'id', null, strval( $row->rev_id ) ) . "\n"; |
| — | — | @@ -520,7 +518,7 @@ |
| 521 | 519 | |
| 522 | 520 | $out .= " </revision>\n"; |
| 523 | 521 | |
| 524 | | - wfProfileOut( $fname ); |
| | 522 | + wfProfileOut( __METHOD__ ); |
| 525 | 523 | return $out; |
| 526 | 524 | } |
| 527 | 525 | |
| — | — | @@ -533,8 +531,7 @@ |
| 534 | 532 | * @access private |
| 535 | 533 | */ |
| 536 | 534 | function writeLogItem( $row ) { |
| 537 | | - $fname = 'WikiExporter::writeLogItem'; |
| 538 | | - wfProfileIn( $fname ); |
| | 535 | + wfProfileIn( __METHOD__ ); |
| 539 | 536 | |
| 540 | 537 | $out = " <logitem>\n"; |
| 541 | 538 | $out .= " " . Xml::element( 'id', null, strval( $row->log_id ) ) . "\n"; |
| — | — | @@ -568,7 +565,7 @@ |
| 569 | 566 | |
| 570 | 567 | $out .= " </logitem>\n"; |
| 571 | 568 | |
| 572 | | - wfProfileOut( $fname ); |
| | 569 | + wfProfileOut( __METHOD__ ); |
| 573 | 570 | return $out; |
| 574 | 571 | } |
| 575 | 572 | |
| — | — | @@ -919,8 +916,7 @@ |
| 920 | 917 | } |
| 921 | 918 | |
| 922 | 919 | function xmlsafe( $string ) { |
| 923 | | - $fname = 'xmlsafe'; |
| 924 | | - wfProfileIn( $fname ); |
| | 920 | + wfProfileIn( __FUNCTION__ ); |
| 925 | 921 | |
| 926 | 922 | /** |
| 927 | 923 | * The page may contain old data which has not been properly normalized. |
| — | — | @@ -930,6 +926,6 @@ |
| 931 | 927 | $string = UtfNormal::cleanUp( $string ); |
| 932 | 928 | |
| 933 | 929 | $string = htmlspecialchars( $string ); |
| 934 | | - wfProfileOut( $fname ); |
| | 930 | + wfProfileOut( __FUNCTION__ ); |
| 935 | 931 | return $string; |
| 936 | 932 | } |