| Index: trunk/phase3/includes/diff/DifferenceEngine.php |
| — | — | @@ -779,7 +779,7 @@ |
| 780 | 780 | function generateDiffBody( $otext, $ntext ) { |
| 781 | 781 | global $wgExternalDiffEngine, $wgContLang; |
| 782 | 782 | |
| 783 | | - wfProfileIn( __METHOD__ ); |
| | 783 | + wfProfileIn( __METHOD__ ); |
| 784 | 784 | |
| 785 | 785 | $otext = str_replace( "\r\n", "\n", $otext ); |
| 786 | 786 | $ntext = str_replace( "\r\n", "\n", $ntext ); |
| — | — | @@ -791,6 +791,7 @@ |
| 792 | 792 | # input text to be HTML-escaped already |
| 793 | 793 | $otext = htmlspecialchars ( $wgContLang->segmentForDiff( $otext ) ); |
| 794 | 794 | $ntext = htmlspecialchars ( $wgContLang->segmentForDiff( $ntext ) ); |
| | 795 | + wfProfileOut( __METHOD__ ); |
| 795 | 796 | return $wgContLang->unsegmentForDiff( wikidiff_do_diff( $otext, $ntext, 2 ) ) . |
| 796 | 797 | $this->debug( 'wikidiff1' ); |
| 797 | 798 | } |
| — | — | @@ -802,6 +803,7 @@ |
| 803 | 804 | $text = wikidiff2_do_diff( $otext, $ntext, 2 ); |
| 804 | 805 | $text .= $this->debug( 'wikidiff2' ); |
| 805 | 806 | wfProfileOut( 'wikidiff2_do_diff' ); |
| | 807 | + wfProfileOut( __METHOD__ ); |
| 806 | 808 | return $text; |
| 807 | 809 | } |
| 808 | 810 | if ( $wgExternalDiffEngine != 'wikidiff3' && $wgExternalDiffEngine !== false ) { |
| Index: trunk/phase3/includes/parser/Tidy.php |
| — | — | @@ -217,6 +217,8 @@ |
| 218 | 218 | if ( !MWInit::classExists( 'tidy' ) ) { |
| 219 | 219 | wfWarn( "Unable to load internal tidy class." ); |
| 220 | 220 | $retval = -1; |
| | 221 | + |
| | 222 | + wfProfileOut( __METHOD__ ); |
| 221 | 223 | return null; |
| 222 | 224 | } |
| 223 | 225 | |