Index: trunk/phase3/includes/diff/DifferenceEngine.php |
— | — | @@ -150,6 +150,8 @@ |
151 | 151 | URL=$url2 |
152 | 152 | CONTROL; |
153 | 153 | echo( $control ); |
| 154 | + |
| 155 | + wfProfileOut( __METHOD__ ); |
154 | 156 | return; |
155 | 157 | } |
156 | 158 | |
— | — | @@ -614,16 +616,20 @@ |
615 | 617 | $this->mCacheHit = true; |
616 | 618 | // Check if the diff should be hidden from this user |
617 | 619 | if ( !$this->loadRevisionData() ) { |
| 620 | + wfProfileOut( __METHOD__ ); |
618 | 621 | return false; |
619 | 622 | } elseif ( $this->mOldRev && !$this->mOldRev->userCan( Revision::DELETED_TEXT ) ) { |
| 623 | + wfProfileOut( __METHOD__ ); |
620 | 624 | return false; |
621 | 625 | } elseif ( $this->mNewRev && !$this->mNewRev->userCan( Revision::DELETED_TEXT ) ) { |
| 626 | + wfProfileOut( __METHOD__ ); |
622 | 627 | return false; |
623 | 628 | } |
624 | 629 | // Short-circuit |
625 | 630 | if ( $this->mOldRev && $this->mNewRev |
626 | 631 | && $this->mOldRev->getID() == $this->mNewRev->getID() ) |
627 | 632 | { |
| 633 | + wfProfileOut( __METHOD__ ); |
628 | 634 | return ''; |
629 | 635 | } |
630 | 636 | // Cacheable? |
— | — | @@ -751,6 +757,7 @@ |
752 | 758 | wfProfileOut( __METHOD__ . "-shellexec" ); |
753 | 759 | unlink( $tempName1 ); |
754 | 760 | unlink( $tempName2 ); |
| 761 | + wfProfileOut( __METHOD__ ); |
755 | 762 | return $difftext; |
756 | 763 | } |
757 | 764 | |
— | — | @@ -759,7 +766,9 @@ |
760 | 767 | $nta = explode( "\n", $wgContLang->segmentForDiff( $ntext ) ); |
761 | 768 | $diffs = new Diff( $ota, $nta ); |
762 | 769 | $formatter = new TableDiffFormatter(); |
763 | | - return $wgContLang->unsegmentForDiff( $formatter->format( $diffs ) ) . |
| 770 | + $difftext = $wgContLang->unsegmentForDiff( $formatter->format( $diffs ) ) . |
| 771 | + wfProfileOut( __METHOD__ ); |
| 772 | + return $difftext; |
764 | 773 | $this->debug(); |
765 | 774 | } |
766 | 775 | |
Index: trunk/phase3/includes/MessageCache.php |
— | — | @@ -440,6 +440,7 @@ |
441 | 441 | wfProfileIn( __METHOD__ ); |
442 | 442 | |
443 | 443 | if ( $this->mDisable ) { |
| 444 | + wfProfileOut( __METHOD__ ); |
444 | 445 | return; |
445 | 446 | } |
446 | 447 | |
Index: trunk/phase3/includes/EditPage.php |
— | — | @@ -666,10 +666,10 @@ |
667 | 667 | // Custom edit intro for new sections |
668 | 668 | $this->section === 'new' ? 'MediaWiki:addsection-editintro' : '' ); |
669 | 669 | |
670 | | - wfProfileOut( __METHOD__ ); |
671 | | - |
672 | 670 | // Allow extensions to modify form data |
673 | 671 | wfRunHooks( 'EditPage::importFormData', array( $this, $request ) ); |
| 672 | + |
| 673 | + wfProfileOut( __METHOD__ ); |
674 | 674 | } |
675 | 675 | |
676 | 676 | /** |