| Index: trunk/phase3/includes/BagOStuff.php |
| — | — | @@ -725,6 +725,7 @@ |
| 726 | 726 | |
| 727 | 727 | $handle = $this->getReader(); |
| 728 | 728 | if ( !$handle ) { |
| | 729 | + wfProfileOut( __METHOD__ ); |
| 729 | 730 | return null; |
| 730 | 731 | } |
| 731 | 732 | |
| — | — | @@ -755,6 +756,7 @@ |
| 756 | 757 | |
| 757 | 758 | $handle = $this->getWriter(); |
| 758 | 759 | if ( !$handle ) { |
| | 760 | + wfProfileOut( __METHOD__ ); |
| 759 | 761 | return false; |
| 760 | 762 | } |
| 761 | 763 | |
| — | — | @@ -771,6 +773,7 @@ |
| 772 | 774 | |
| 773 | 775 | $handle = $this->getWriter(); |
| 774 | 776 | if ( !$handle ) { |
| | 777 | + wfProfileOut( __METHOD__ ); |
| 775 | 778 | return false; |
| 776 | 779 | } |
| 777 | 780 | |
| — | — | @@ -789,6 +792,7 @@ |
| 790 | 793 | $handle = $this->getWriter(); |
| 791 | 794 | |
| 792 | 795 | if ( !$handle ) { |
| | 796 | + wfProfileOut( __METHOD__ ); |
| 793 | 797 | return false; |
| 794 | 798 | } |
| 795 | 799 | |
| Index: trunk/phase3/includes/parser/Tidy.php |
| — | — | @@ -173,15 +173,13 @@ |
| 174 | 174 | $retval = -1; |
| 175 | 175 | } |
| 176 | 176 | |
| 177 | | - wfProfileOut( __METHOD__ ); |
| 178 | | - |
| 179 | 177 | if( !$stderr && $cleansource == '' && $text != '' ) { |
| 180 | 178 | // Some kind of error happened, so we couldn't get the corrected text. |
| 181 | 179 | // Just give up; we'll use the source text and append a warning. |
| 182 | | - return null; |
| 183 | | - } else { |
| 184 | | - return $cleansource; |
| | 180 | + $cleansource = null; |
| 185 | 181 | } |
| | 182 | + wfProfileOut( __METHOD__ ); |
| | 183 | + return $cleansource; |
| 186 | 184 | } |
| 187 | 185 | |
| 188 | 186 | /** |
| — | — | @@ -199,6 +197,7 @@ |
| 200 | 198 | |
| 201 | 199 | if( $stderr ) { |
| 202 | 200 | $retval = $tidy->getStatus(); |
| | 201 | + wfProfileOut( __METHOD__ ); |
| 203 | 202 | return $tidy->errorBuffer; |
| 204 | 203 | } else { |
| 205 | 204 | $tidy->cleanRepair(); |
| Index: trunk/phase3/includes/parser/Parser.php |
| — | — | @@ -2448,6 +2448,7 @@ |
| 2449 | 2449 | } |
| 2450 | 2450 | if ( $stack > 0 ) { |
| 2451 | 2451 | wfDebug( __METHOD__.": Invalid input; not enough close tags (stack $stack, state $state)\n" ); |
| | 2452 | + wfProfileOut( __METHOD__ ); |
| 2452 | 2453 | return false; |
| 2453 | 2454 | } |
| 2454 | 2455 | wfProfileOut( __METHOD__ ); |
| Index: trunk/phase3/includes/parser/Parser_LinkHooks.php |
| — | — | @@ -265,9 +265,10 @@ |
| 266 | 266 | if( $return === false ) { |
| 267 | 267 | # False (no link) was returned, output plain wikitext |
| 268 | 268 | # Build it again as the hook is allowed to modify $paramText |
| 269 | | - return isset($paramText) ? "[[$titleText|$paramText]]" : "[[$titleText]]"; |
| | 269 | + $return = isset($paramText) ? "[[$titleText|$paramText]]" : "[[$titleText]]"; |
| 270 | 270 | } |
| 271 | 271 | # Content was returned, return it |
| | 272 | + wfProfileOut( __METHOD__ ); |
| 272 | 273 | return $return; |
| 273 | 274 | } |
| 274 | 275 | |
| Index: trunk/phase3/includes/Linker.php |
| — | — | @@ -722,6 +722,7 @@ |
| 723 | 723 | return $this->linkKnown( $title, "$prefix$text$inside", array(), $query ) . $trail; |
| 724 | 724 | } |
| 725 | 725 | } else { |
| | 726 | + wfProfileOut( __METHOD__ ); |
| 726 | 727 | return "<!-- ERROR -->{$prefix}{$text}{$trail}"; |
| 727 | 728 | } |
| 728 | 729 | } |
| — | — | @@ -1668,6 +1669,7 @@ |
| 1669 | 1670 | */ |
| 1670 | 1671 | public function accesskey( $name ) { |
| 1671 | 1672 | if ( isset( $this->accesskeycache[$name] ) ) { |
| | 1673 | + wfProfileOut( __METHOD__ ); |
| 1672 | 1674 | return $this->accesskeycache[$name]; |
| 1673 | 1675 | } |
| 1674 | 1676 | wfProfileIn( __METHOD__ ); |