followup r88898 -- move BeforeInitialize hook to where it can be

[lhc/web/wiklou.git] / includes / Wiki.php

diff --git a/includes/Wiki.php b/includes/Wiki.php
index 996302e..8b62139 100644 (file)
--- a/includes/Wiki.php
+++ b/includes/Wiki.php
@@ -146,9 +146,6 @@ class MediaWiki {
                        $output->setPrintable();
                }
 
-               wfRunHooks( 'BeforeInitialize',
-                       array( &$title, null, &$output, &$user, $request, $this ) );
-
                // Invalid titles. Bug 21776: The interwikis must redirect even if the page name is empty.
                if ( is_null( $title ) || ( $title->getDBkey() == '' && $title->getInterwiki() == '' ) ||
                        $title->isSpecial( 'Badtitle' ) )
@@ -270,6 +267,8 @@ class MediaWiki {
                                wfProfileOut( __METHOD__ );
                                throw new MWException( "Shouldn't happen: MediaWiki::initializeArticle() returned neither an object nor a URL" );
                        }
+                       wfRunHooks( 'BeforeInitialize',
+                               array( &$title, &$article, &$output, &$user, $request, $this ) );
                }
 
                if ( $pageView ) {