(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 3b8c641..38f19c9 100644 (file)
--- a/includes/Wiki.php
+++ b/includes/Wiki.php
@@ -42,6 +42,7 @@ class MediaWiki {
        /**
         * Initialization of ... everything
         * Performs the request too
+        * FIXME: why is this crap called "initialize" when it performs everything?
         *
         * @param $title Title ($wgTitle)
         * @param $article Article
@@ -50,7 +51,11 @@ class MediaWiki {
         * @param $request WebRequest
         */
        function initialize( &$title, &$article, &$output, &$user, $request ) {
-               $this->preliminaryChecks( $title, $output, $request ) ;
+               wfProfileIn( __METHOD__ );
+               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 ) ) {
@@ -59,9 +64,11 @@ class MediaWiki {
                        } elseif( is_string( $new_article ) ) {
                                $output->redirect( $new_article );
                        } else {
+                               wfProfileOut( __METHOD__ );
                                throw new MWException( "Shouldn't happen: MediaWiki::initializeArticle() returned neither an object nor a URL" );
                        }
                }
+               wfProfileOut( __METHOD__ );
        }
 
        /**
@@ -82,7 +89,6 @@ class MediaWiki {
                }
        }
 
-
        /**
         * Checks some initial queries
         * Note that $title here is *not* a Title object, but a string!
@@ -108,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;
@@ -143,8 +151,10 @@ class MediaWiki {
                if( !is_null( $title ) && !$title->userCanRead() ) {
                        $output->loginToUse();
                        $output->output();
-                       exit;
+                       $output->disable();
+                       return false;
                }
+               return true;
        }
 
        /**
@@ -154,6 +164,8 @@ class MediaWiki {
         * - redirect loop
         * - special pages
         *
+        * FIXME: why is this crap called "initialize" when it performs everything?
+        *
         * @param $title Title
         * @param $output OutputPage
         * @param $request WebRequest
@@ -264,9 +276,14 @@ class MediaWiki {
        function initializeArticle( &$title, $request ) {
                wfProfileIn( __METHOD__ );
 
-               $action = $this->getVal( 'action' );
+               $action = $this->getVal( 'action', 'view' );
                $article = self::articleFromTitle( $title );
-               
+               # NS_MEDIAWIKI has no redirects.
+               # It is also used for CSS/JS, so performance matters here...
+               if( $title->getNamespace() == NS_MEDIAWIKI ) {
+                       wfProfileOut( __METHOD__ );
+                       return $article;
+               }
                // Namespace might change when using redirects
                // Check for redirects ...
                $file = ($title->getNamespace() == NS_FILE) ? $article->getFile() : null;
@@ -282,7 +299,8 @@ class MediaWiki {
                        $dbr = wfGetDB( DB_SLAVE );
                        $article->loadPageData( $article->pageDataFromTitle( $dbr, $title ) );
 
-                       wfRunHooks( 'InitializeArticleMaybeRedirect', array( &$title, &$request, &$ignoreRedirect, &$target ) );
+                       wfRunHooks( 'InitializeArticleMaybeRedirect', 
+                               array(&$title,&$request,&$ignoreRedirect,&$target,&$article) );
 
                        // Follow redirects only for... redirects
                        if( !$ignoreRedirect && $article->isRedirect() ) {
@@ -294,8 +312,7 @@ class MediaWiki {
                                                return $target;
                                        }
                                }
-
-                               if( is_object( $target ) ) {
+                               if( is_object($target) ) {
                                        // Rewrite environment to redirected article
                                        $rarticle = self::articleFromTitle( $target );
                                        $rarticle->loadPageData( $rarticle->pageDataFromTitle( $dbr, $target ) );
@@ -319,7 +336,7 @@ class MediaWiki {
         * @param $deferredUpdates array of updates to do
         * @param $output OutputPage
         */
-       function finalCleanup ( &$deferredUpdates, &$output ) {
+       function finalCleanup( &$deferredUpdates, &$output ) {
                wfProfileIn( __METHOD__ );
                # Now commit any transactions, so that unreported errors after output() don't roll back the whole thing
                $factory = wfGetLBFactory();
@@ -343,11 +360,13 @@ class MediaWiki {
         * @param $updates array of objects that hold an update to do
         */
        function doUpdates( &$updates ) {
+               wfProfileIn( __METHOD__ );
                /* No need to get master connections in case of empty updates array */
-               if( !$updates ) {
+               if (!$updates) {
+                       wfProfileOut( __METHOD__ );
                        return;
                }
-               wfProfileIn( __METHOD__ );
+
                $dbw = wfGetDB( DB_MASTER );
                foreach( $updates as $up ) {
                        $up->doUpdate();
@@ -412,7 +431,10 @@ class MediaWiki {
         * @param $request WebRequest
         */
        function performAction( &$output, &$article, &$title, &$user, &$request ) {
+               wfProfileIn( __METHOD__ );
+
                if( !wfRunHooks( 'MediaWikiPerformAction', array( $output, $article, $title, $user, $request, $this ) ) ) {
+                       wfProfileOut( __METHOD__ );
                        return;
                }
 
@@ -427,6 +449,12 @@ class MediaWiki {
                                $output->setSquidMaxage( $this->getVal( 'SquidMaxage' ) );
                                $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':
                        case 'delete':
@@ -494,15 +522,12 @@ class MediaWiki {
                                $history = new PageHistory( $article );
                                $history->history();
                                break;
-                       case 'raw':
-                               $raw = new RawPage( $article );
-                               $raw->view();
-                               break;
                        default:
                                if( wfRunHooks( 'UnknownAction', array( $action, $article ) ) ) {
                                        $output->showErrorPage( 'nosuchaction', 'nosuchactiontext' );
                                }
                }
+               wfProfileOut( __METHOD__ );
 
        }