| Index: trunk/phase3/includes/Wiki.php |
| — | — | @@ -50,7 +50,6 @@ |
| 51 | 51 | * @param $request WebRequest |
| 52 | 52 | */ |
| 53 | 53 | function initialize( &$title, &$article, &$output, &$user, $request ) { |
| 54 | | - wfProfileIn( __METHOD__ ); |
| 55 | 54 | $this->preliminaryChecks( $title, $output, $request ) ; |
| 56 | 55 | if( !$this->initializeSpecialCases( $title, $output, $request ) ) { |
| 57 | 56 | $new_article = $this->initializeArticle( $title, $request ); |
| — | — | @@ -60,11 +59,9 @@ |
| 61 | 60 | } elseif( is_string( $new_article ) ) { |
| 62 | 61 | $output->redirect( $new_article ); |
| 63 | 62 | } else { |
| 64 | | - wfProfileOut( __METHOD__ ); |
| 65 | 63 | throw new MWException( "Shouldn't happen: MediaWiki::initializeArticle() returned neither an object nor a URL" ); |
| 66 | 64 | } |
| 67 | 65 | } |
| 68 | | - wfProfileOut( __METHOD__ ); |
| 69 | 66 | } |
| 70 | 67 | |
| 71 | 68 | /** |
| — | — | @@ -132,7 +129,6 @@ |
| 133 | 130 | * @param $request WebRequest |
| 134 | 131 | */ |
| 135 | 132 | function preliminaryChecks( &$title, &$output, $request ) { |
| 136 | | - |
| 137 | 133 | if( $request->getCheck( 'search' ) ) { |
| 138 | 134 | // Compatibility with old search URLs which didn't use Special:Search |
| 139 | 135 | // Just check for presence here, so blank requests still |
| — | — | @@ -141,7 +137,6 @@ |
| 142 | 138 | // Do this above the read whitelist check for security... |
| 143 | 139 | $title = SpecialPage::getTitleFor( 'Search' ); |
| 144 | 140 | } |
| 145 | | - |
| 146 | 141 | # If the user is not logged in, the Namespace:title of the article must be in |
| 147 | 142 | # the Read array in order for the user to see it. (We have to check here to |
| 148 | 143 | # catch special pages etc. We check again in Article::view()) |
| — | — | @@ -150,7 +145,6 @@ |
| 151 | 146 | $output->output(); |
| 152 | 147 | exit; |
| 153 | 148 | } |
| 154 | | - |
| 155 | 149 | } |
| 156 | 150 | |
| 157 | 151 | /** |
| — | — | @@ -418,10 +412,7 @@ |
| 419 | 413 | * @param $request WebRequest |
| 420 | 414 | */ |
| 421 | 415 | function performAction( &$output, &$article, &$title, &$user, &$request ) { |
| 422 | | - wfProfileIn( __METHOD__ ); |
| 423 | | - |
| 424 | 416 | if( !wfRunHooks( 'MediaWikiPerformAction', array( $output, $article, $title, $user, $request, $this ) ) ) { |
| 425 | | - wfProfileOut( __METHOD__ ); |
| 426 | 417 | return; |
| 427 | 418 | } |
| 428 | 419 | |
| — | — | @@ -512,7 +503,6 @@ |
| 513 | 504 | $output->showErrorPage( 'nosuchaction', 'nosuchactiontext' ); |
| 514 | 505 | } |
| 515 | 506 | } |
| 516 | | - wfProfileOut( __METHOD__ ); |
| 517 | 507 | |
| 518 | 508 | } |
| 519 | 509 | |