(bug 16899) DISPLAYTITLE should allow Arabic and Persian harakats

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

diff --git a/includes/Wiki.php b/includes/Wiki.php
index 00fd407..38f19c9 100644 (file)
--- a/includes/Wiki.php
+++ b/includes/Wiki.php
@@ -52,7 +52,10 @@ class MediaWiki {
         */
        function initialize( &$title, &$article, &$output, &$user, $request ) {
                wfProfileIn( __METHOD__ );
-               $this->preliminaryChecks( $title, $output, $request );
+               if( !$this->preliminaryChecks( $title, $output, $request ) ) {
+                       wfProfileOut( __METHOD__ );
+                       return;
+               }
                if( !$this->initializeSpecialCases( $title, $output, $request ) ) {
                        $new_article = $this->initializeArticle( $title, $request );
                        if( is_object( $new_article ) ) {
@@ -111,14 +114,16 @@ class MediaWiki {
                        // about the possible different language variants
                        if( count( $wgContLang->getVariants() ) > 1 && !is_null( $ret ) && $ret->getArticleID() == 0 )
                                $wgContLang->findVariantLink( $title, $ret );
-
                }
-               if( ( $oldid = $wgRequest->getInt( 'oldid' ) )
-                       && ( is_null( $ret ) || $ret->getNamespace() != NS_SPECIAL ) ) {
-                       // Allow oldid to override a changed or missing title.
-                       $rev = Revision::newFromId( $oldid );
-                       if( $rev ) {
-                               $ret = $rev->getTitle();
+               # For non-special titles, check for implicit titles
+               if( is_null( $ret ) || $ret->getNamespace() != NS_SPECIAL ) {
+                       // We can have urls with just ?diff=,?oldid= or even just ?diff=
+                       $oldid = $wgRequest->getInt( 'oldid' );
+                       $oldid = $oldid ? $oldid : $wgRequest->getInt( 'diff' );
+                       // Allow oldid to override a changed or missing title
+                       if( $oldid ) {
+                               $rev = Revision::newFromId( $oldid );
+                               $ret = $rev ? $rev->getTitle() : $ret;
                        }
                }
                return $ret;
@@ -146,8 +151,10 @@ class MediaWiki {
                if( !is_null( $title ) && !$title->userCanRead() ) {
                        $output->loginToUse();
                        $output->output();
-                       exit;
+                       $output->disable();
+                       return false;
                }
+               return true;
        }
 
        /**
@@ -221,25 +228,6 @@ class MediaWiki {
                        /* actions that need to be made when we have a special pages */
                        SpecialPage::executePath( $title );
                } else {
-                       /* Try low-level file cache hit */
-                       if( $title->getNamespace() != NS_MEDIAWIKI && HTMLFileCache::useFileCache() ) {
-                               $cache = new HTMLFileCache( $title );
-                               if( $cache->isFileCacheGood( /* Assume up to date */ ) ) {
-                                       global $wgOut;
-                                       /* Check incoming headers to see if client has this cached */
-                                       if( !$wgOut->checkLastModified( $cache->fileCacheTime() ) ) {
-                                               wfDebug( "MediaWiki::initializeSpecialCases(): about to load file cache\n" );
-                                               $cache->loadFromFileCache();
-                                               # Tell $wgOut that output is taken care of
-                                               $wgOut->disable();
-                                               # Do any stats increment/watchlist stuff
-                                               $article = self::articleFromTitle( $title );
-                                               $article->viewUpdates();
-                                       }
-                                       wfProfileOut( __METHOD__ );
-                                       return true;
-                               }
-                       }
                        /* No match to special cases */
                        wfProfileOut( __METHOD__ );
                        return false;
@@ -462,8 +450,10 @@ class MediaWiki {
                                $article->view();
                                break;
                        case 'raw': // includes JS/CSS
+                               wfProfileIn( __METHOD__.'-raw' );
                                $raw = new RawPage( $article );
                                $raw->view();
+                               wfProfileOut( __METHOD__.'-raw' );
                                break;
                        case 'watch':
                        case 'unwatch':