]> scripts.mit.edu Git - autoinstallsdev/mediawiki.git/blobdiff - includes/Wiki.php
MediaWiki 1.17.1
[autoinstallsdev/mediawiki.git] / includes / Wiki.php
index 72a6a61db8586d2d653ff26bff53fa801d37fe4f..4c3af0f786cd12ef1cd058d70430ac0047716442 100644 (file)
@@ -1,21 +1,21 @@
 <?php
 /**
  * MediaWiki is the to-be base class for this whole project
+ *
+ * @internal documentation reviewed 15 Mar 2010
  */
-
 class MediaWiki {
-
-       var $GET; /* Stores the $_GET variables at time of creation, can be changed */
        var $params = array();
 
-       /** Constructor. It just save the $_GET variable */
-       function __construct() {
-               $this->GET = $_GET;
-       }
+       /** Constructor */
+       function __construct() {}
 
        /**
         * Stores key/value pairs to circumvent global variables
         * Note that keys are case-insensitive!
+        *
+        * @param $key String: key to store
+        * @param $value Mixed: value to put for the key
         */
        function setVal( $key, &$value ) {
                $key = strtolower( $key );
@@ -25,6 +25,10 @@ class MediaWiki {
        /**
         * Retrieves key/value pairs to circumvent global variables
         * Note that keys are case-insensitive!
+        *
+        * @param $key String: key to get
+        * @param $default string default value, defaults to empty string
+        * @return $default Mixed: default value if if the key doesn't exist
         */
        function getVal( $key, $default = '' ) {
                $key = strtolower( $key );
@@ -36,147 +40,202 @@ class MediaWiki {
 
        /**
         * Initialization of ... everything
-        @return Article either the object to become $wgArticle, or NULL
+        * Performs the request too
+        *
+        * @param $title Title ($wgTitle)
+        * @param $article Article
+        * @param $output OutputPage
+        * @param $user User
+        * @param $request WebRequest
         */
-       function initialize ( &$title, &$output, &$user, $request) {
-               wfProfileIn( 'MediaWiki::initialize' );
-               $this->preliminaryChecks ( $title, $output, $request ) ;
-               $article = NULL;
-               if ( !$this->initializeSpecialCases( $title, $output, $request ) ) {
-                       $article = $this->initializeArticle( $title, $request );
-                       if( is_object( $article ) ) {
+       function performRequestForTitle( &$title, &$article, &$output, &$user, $request ) {
+               wfProfileIn( __METHOD__ );
+
+               $output->setTitle( $title );
+
+               wfRunHooks( 'BeforeInitialize', array( &$title, &$article, &$output, &$user, $request, $this ) );
+
+               if( !$this->preliminaryChecks( $title, $output ) ) {
+                       wfProfileOut( __METHOD__ );
+                       return;
+               }
+               // Call handleSpecialCases() to deal with all special requests...
+               if( !$this->handleSpecialCases( $title, $output, $request ) ) {
+                       // ...otherwise treat it as an article view. The article
+                       // may be a redirect to another article or URL.
+                       $new_article = $this->initializeArticle( $title, $output, $request );
+                       if( is_object( $new_article ) ) {
+                               $article = $new_article;
                                $this->performAction( $output, $article, $title, $user, $request );
-                       } elseif( is_string( $article ) ) {
-                               $output->redirect( $article );
+                       } 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( 'MediaWiki::initialize' );
-               return $article;
+               wfProfileOut( __METHOD__ );
        }
 
+       /**
+        * Check if the maximum lag of database slaves is higher that $maxLag, and
+        * if it's the case, output an error message
+        *
+        * @param $maxLag int: maximum lag allowed for the request, as supplied by
+        *                the client
+        * @return bool true if the request can continue
+        */
        function checkMaxLag( $maxLag ) {
-               global $wgLoadBalancer, $wgShowHostnames;
-               list( $host, $lag ) = $wgLoadBalancer->getMaxLag();
-               if ( $lag > $maxLag ) {
-                       header( 'HTTP/1.1 503 Service Unavailable' );
-                       header( 'Retry-After: ' . max( intval( $maxLag ), 5 ) );
-                       header( 'X-Database-Lag: ' . intval( $lag ) );
-                       header( 'Content-Type: text/plain' );
-                       if( $wgShowHostnames ) {
-                               echo "Waiting for $host: $lag seconds lagged\n";
-                       } else {
-                               echo "Waiting for a database server: $lag seconds lagged\n";
-                       }
+               list( $host, $lag ) = wfGetLB()->getMaxLag();
+               if( $lag > $maxLag ) {
+                       wfMaxlagError( $host, $lag, $maxLag );
                        return false;
                } else {
                        return true;
                }
        }
 
-
        /**
         * Checks some initial queries
         * Note that $title here is *not* a Title object, but a string!
+        *
+        * @param $title String
+        * @param $action String
+        * @return Title object to be $wgTitle
         */
-       function checkInitialQueries( $title,$action,&$output,$request, $lang) {
-               if ($request->getVal( 'printable' ) == 'yes') {
-                       $output->setPrintable();
+       function checkInitialQueries( $title, $action ) {
+               global $wgOut, $wgRequest, $wgContLang;
+               if( $wgRequest->getVal( 'printable' ) === 'yes' ) {
+                       $wgOut->setPrintable();
                }
 
-               $ret = NULL ;
-
-
-               if ( '' == $title && 'delete' != $action ) {
-                       $ret = Title::newMainPage();
-               } elseif ( $curid = $request->getInt( 'curid' ) ) {
-                       # URLs like this are generated by RC, because rc_title isn't always accurate
+               $curid = $wgRequest->getInt( 'curid' );
+               if( $wgRequest->getCheck( 'search' ) ) {
+                       // Compatibility with old search URLs which didn't use Special:Search
+                       // Just check for presence here, so blank requests still
+                       // show the search page when using ugly URLs (bug 8054).
+                       $ret = SpecialPage::getTitleFor( 'Search' );
+               } elseif( $curid ) {
+                       // URLs like this are generated by RC, because rc_title isn't always accurate
                        $ret = Title::newFromID( $curid );
+               } elseif( $title == '' && $action != 'delete' ) {
+                       $ret = Title::newMainPage();
                } else {
                        $ret = Title::newFromURL( $title );
-                       /* check variant links so that interwiki links don't have to worry about
-                          the possible different language variants
-                       */
-                       if( count($lang->getVariants()) > 1 && !is_null($ret) && $ret->getArticleID() == 0 )
-                               $lang->findVariantLink( $title, $ret );
-
+                       // check variant links so that interwiki links don't have to worry
+                       // about the possible different language variants
+                       if( count( $wgContLang->getVariants() ) > 1 && !is_null( $ret ) && $ret->getArticleID() == 0 )
+                               $wgContLang->findVariantLink( $title, $ret );
                }
-               if ( ( $oldid = $request->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 ;
+               return $ret;
        }
 
        /**
-        * Checks for search query and anon-cannot-read case
+        * Checks for anon-cannot-read case
+        *
+        * @param $title Title
+        * @param $output OutputPage
+        * @return boolean true if successful
         */
-       function preliminaryChecks ( &$title, &$output, $request ) {
-
-               if( $request->getCheck( 'search' ) ) {
-                       // Compatibility with old search URLs which didn't use Special:Search
-                       // Just check for presence here, so blank requests still
-                       // show the search page when using ugly URLs (bug 8054).
-                       
-                       // Do this above the read whitelist check for security...
-                       $title = SpecialPage::getTitleFor( 'Search' );
-               }
+       function preliminaryChecks( &$title, &$output ) {
+               global $wgTitle;
+               // If the user is not logged in, the Namespace:title of the article must be in
+               // the Read array in order for the user to see it. (We have to check here to
+               // catch special pages etc. We check again in Article::view())
+               if( !is_null( $title ) && !$title->userCanRead() ) {
+                       // Bug 32276: allowing the skin to generate output with $wgTitle 
+                       // set to the input title would allow anonymous users to 
+                       // determine whether a page exists, potentially leaking private data. In fact, the 
+                       // curid and oldid request  parameters would allow page titles to be enumerated even 
+                       // when they are not guessable. So we reset the title to Special:Badtitle before the 
+                       // permissions error is displayed.
+                       $badtitle = SpecialPage::getTitleFor( 'Badtitle' );
+                       $output->setTitle( $badtitle );
+                       $wgTitle = $badtitle;
 
-               # If the user is not logged in, the Namespace:title of the article must be in
-               # the Read array in order for the user to see it. (We have to check here to
-               # catch special pages etc. We check again in Article::view())
-               if ( !is_null( $title ) && !$title->userCanRead() ) {
                        $output->loginToUse();
-                       $output->output();
-                       exit;
+                       $this->finalCleanup( $output );
+                       $output->disable();
+                       return false;
                }
-
+               return true;
        }
 
        /**
-        * Initialize the object to be known as $wgArticle for special cases
+        * Initialize some special cases:
+        * - bad titles
+        * - local interwiki redirects
+        * - redirect loop
+        * - special pages
+        *
+        * @param $title Title
+        * @param $output OutputPage
+        * @param $request WebRequest
+        * @return bool true if the request is already executed
         */
-       function initializeSpecialCases ( &$title, &$output, $request ) {
-               global $wgRequest;
-               wfProfileIn( 'MediaWiki::initializeSpecialCases' );
+       function handleSpecialCases( &$title, &$output, $request ) {
+               wfProfileIn( __METHOD__ );
+
+               $action = $this->getVal( 'Action' );
 
-               $action = $this->getVal('Action');
-               if( !$title or $title->getDBkey() == '' ) {
+               // Invalid titles. Bug 21776: The interwikis must redirect even if the page name is empty.
+               if( is_null($title) || ( ( $title->getDBkey() == '' ) && ( $title->getInterwiki() == '' ) ) ) {
                        $title = SpecialPage::getTitleFor( 'Badtitle' );
-                       # Die now before we mess up $wgArticle and the skin stops working
+                       $output->setTitle( $title ); // bug 21456
+                       // Die now before we mess up $wgArticle and the skin stops working
                        throw new ErrorPageError( 'badtitle', 'badtitletext' );
-               } else if ( $title->getInterwiki() != '' ) {
-                       if( $rdfrom = $request->getVal( 'rdfrom' ) ) {
+
+               // Interwiki redirects
+               } else if( $title->getInterwiki() != '' ) {
+                       $rdfrom = $request->getVal( 'rdfrom' );
+                       if( $rdfrom ) {
                                $url = $title->getFullURL( 'rdfrom=' . urlencode( $rdfrom ) );
                        } else {
-                               $url = $title->getFullURL();
+                               $query = $request->getValues();
+                               unset( $query['title'] );
+                               $url = $title->getFullURL( $query );
                        }
                        /* Check for a redirect loop */
-                       if ( !preg_match( '/^' . preg_quote( $this->getVal('Server'), '/' ) . '/', $url ) && $title->isLocal() ) {
-                               $output->redirect( $url );
+                       if( !preg_match( '/^' . preg_quote( $this->getVal('Server'), '/' ) . '/', $url ) && $title->isLocal() ) {
+                               // 301 so google et al report the target as the actual url.
+                               $output->redirect( $url, 301 );
                        } else {
                                $title = SpecialPage::getTitleFor( 'Badtitle' );
+                               $output->setTitle( $title ); // bug 21456
+                               wfProfileOut( __METHOD__ );
                                throw new ErrorPageError( 'badtitle', 'badtitletext' );
                        }
-               } else if ( ( $action == 'view' ) && !$wgRequest->wasPosted() && 
-                       (!isset( $this->GET['title'] ) || $title->getPrefixedDBKey() != $this->GET['title'] ) &&
-                       !count( array_diff( array_keys( $this->GET ), array( 'action', 'title' ) ) ) )
+               // Redirect loops, no title in URL, $wgUsePathInfo URLs, and URLs with a variant
+               } else if ( $action == 'view' && !$request->wasPosted()
+                       && ( $request->getVal( 'title' ) === null || $title->getPrefixedDBKey() != $request->getVal( 'title' ) )
+                       && !count( array_diff( array_keys( $request->getValues() ), array( 'action', 'title' ) ) ) )
                {
+                       if ( $title->getNamespace() == NS_SPECIAL ) {
+                               list( $name, $subpage ) = SpecialPage::resolveAliasWithSubpage( $title->getDBkey() );
+                               if ( $name ) {
+                                       $title = SpecialPage::getTitleFor( $name, $subpage );
+                               }
+                       }
                        $targetUrl = $title->getFullURL();
                        // Redirect to canonical url, make it a 301 to allow caching
-                       global $wgUsePathInfo;
-                       if( $targetUrl == $wgRequest->getFullRequestURL() ) {
+                       if( $targetUrl == $request->getFullRequestURL() ) {
                                $message = "Redirect loop detected!\n\n" .
                                        "This means the wiki got confused about what page was " .
                                        "requested; this sometimes happens when moving a wiki " .
                                        "to a new server or changing the server configuration.\n\n";
 
-                               if( $wgUsePathInfo ) {
+                               if( $this->getVal( 'UsePathInfo' ) ) {
                                        $message .= "The wiki is trying to interpret the page " .
                                                "title from the URL path portion (PATH_INFO), which " .
                                                "sometimes fails depending on the web server. Try " .
@@ -191,162 +250,170 @@ class MediaWiki {
                                                "to true.";
                                }
                                wfHttpError( 500, "Internal error", $message );
+                               wfProfileOut( __METHOD__ );
                                return false;
                        } else {
                                $output->setSquidMaxage( 1200 );
-                               $output->redirect( $targetUrl, '301');
+                               $output->redirect( $targetUrl, '301' );
                        }
-               } else if ( NS_SPECIAL == $title->getNamespace() ) {
+               // Special pages
+               } else if( NS_SPECIAL == $title->getNamespace() ) {
                        /* actions that need to be made when we have a special pages */
                        SpecialPage::executePath( $title );
                } else {
                        /* No match to special cases */
-                       wfProfileOut( 'MediaWiki::initializeSpecialCases' );
+                       wfProfileOut( __METHOD__ );
                        return false;
                }
                /* Did match a special case */
-               wfProfileOut( 'MediaWiki::initializeSpecialCases' );
+               wfProfileOut( __METHOD__ );
                return true;
        }
 
        /**
         * Create an Article object of the appropriate class for the given page.
-        * @param Title $title
-        * @return Article
+        *
+        * @param $title Title
+        * @return Article object
         */
-       static function articleFromTitle( $title ) {
-               $article = null;
-               wfRunHooks('ArticleFromTitle', array( &$title, &$article ) );
-               if ( $article ) {
-                       return $article;
-               }
-
+       static function articleFromTitle( &$title ) {
                if( NS_MEDIA == $title->getNamespace() ) {
                        // FIXME: where should this go?
-                       $title = Title::makeTitle( NS_IMAGE, $title->getDBkey() );
+                       $title = Title::makeTitle( NS_FILE, $title->getDBkey() );
+               }
+
+               $article = null;
+               wfRunHooks( 'ArticleFromTitle', array( &$title, &$article ) );
+               if( $article ) {
+                       return $article;
                }
 
                switch( $title->getNamespace() ) {
-               case NS_IMAGE:
-                       return new ImagePage( $title );
-               case NS_CATEGORY:
-                       return new CategoryPage( $title );
-               default:
-                       return new Article( $title );
+                       case NS_FILE:
+                               return new ImagePage( $title );
+                       case NS_CATEGORY:
+                               return new CategoryPage( $title );
+                       default:
+                               return new Article( $title );
                }
        }
 
        /**
         * Initialize the object to be known as $wgArticle for "standard" actions
         * Create an Article object for the page, following redirects if needed.
-        * @param Title $title
-        * @param Request $request
-        * @param string $action
+        *
+        * @param $title Title ($wgTitle)
+        * @param $output OutputPage ($wgOut)
+        * @param $request WebRequest ($wgRequest)
         * @return mixed an Article, or a string to redirect to another URL
         */
-       function initializeArticle( $title, $request ) {
-               global $wgTitle;
-               wfProfileIn( 'MediaWiki::initializeArticle' );
-
-               $action = $this->getVal('Action');
-               $article = $this->articleFromTitle( $title );
-
+       function initializeArticle( &$title, &$output, $request ) {
+               wfProfileIn( __METHOD__ );
+
+               $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
-               if( $action == 'view' && !$request->getVal( 'oldid' ) &&
-                                               $request->getVal( 'redirect' ) != 'no' ) {
+               // Check for redirects ...
+               $file = ($title->getNamespace() == NS_FILE) ? $article->getFile() : null;
+               if( ( $action == 'view' || $action == 'render' )        // ... for actions that show content
+                       && !$request->getVal( 'oldid' ) &&    // ... and are not old revisions
+                       !$request->getVal( 'diff' ) &&    // ... and not when showing diff
+                       $request->getVal( 'redirect' ) != 'no' &&       // ... unless explicitly told not to
+                       // ... and the article is not a non-redirect image page with associated file
+                       !( is_object( $file ) && $file->exists() && !$file->getRedirected() ) )
+               {
+                       // Give extensions a change to ignore/handle redirects as needed
+                       $ignoreRedirect = $target = false;
 
-                       $dbr = wfGetDB(DB_SLAVE);
-                       $article->loadPageData($article->pageDataFromTitle($dbr, $title));
+                       $dbr = wfGetDB( DB_SLAVE );
+                       $article->loadPageData( $article->pageDataFromTitle( $dbr, $title ) );
 
-                       /* Follow redirects only for... redirects */
-                       if ($article->mIsRedirect) {
-                               $target = $article->followRedirect();
+                       wfRunHooks( 'InitializeArticleMaybeRedirect',
+                               array(&$title,&$request,&$ignoreRedirect,&$target,&$article) );
+
+                       // Follow redirects only for... redirects.
+                       // If $target is set, then a hook wanted to redirect.
+                       if( !$ignoreRedirect && ($target || $article->isRedirect()) ) {
+                               // Is the target already set by an extension?
+                               $target = $target ? $target : $article->followRedirect();
                                if( is_string( $target ) ) {
-                                       global $wgDisableHardRedirects;
-                                       if( !$wgDisableHardRedirects ) {
+                                       if( !$this->getVal( 'DisableHardRedirects' ) ) {
                                                // we'll need to redirect
+                                               wfProfileOut( __METHOD__ );
                                                return $target;
                                        }
                                }
-                               if( is_object( $target ) ) {
-                                       /* Rewrite environment to redirected article */
-                                       $rarticle = $this->articleFromTitle($target);
-                                       $rarticle->loadPageData($rarticle->pageDataFromTitle($dbr,$target));
-                                       if ($rarticle->mTitle->mArticleID) {
+                               if( is_object($target) ) {
+                                       // Rewrite environment to redirected article
+                                       $rarticle = self::articleFromTitle( $target );
+                                       $rarticle->loadPageData( $rarticle->pageDataFromTitle( $dbr, $target ) );
+                                       if( $rarticle->exists() || ( is_object( $file ) && !$file->isLocal() ) ) {
+                                               $rarticle->setRedirectedFrom( $title );
                                                $article = $rarticle;
-                                               $wgTitle = $target;
-                                               $article->setRedirectedFrom( $title );
-                                       } else {
-                                               $wgTitle = $title;
+                                               $title = $target;
+                                               $output->setTitle( $title );
                                        }
                                }
                        } else {
-                               $wgTitle = $article->mTitle;
+                               $title = $article->getTitle();
                        }
                }
-               wfProfileOut( 'MediaWiki::initializeArticle' );
+               wfProfileOut( __METHOD__ );
                return $article;
        }
 
        /**
-        * Cleaning up by doing deferred updates, calling loadbalancer and doing the output
+        * Cleaning up request by doing:
+        ** deferred updates, DB transaction, and the output
+        *
+        * @param $output OutputPage
         */
-       function finalCleanup ( &$deferredUpdates, &$loadBalancer, &$output ) {
-               wfProfileIn( 'MediaWiki::finalCleanup' );
-               $this->doUpdates( $deferredUpdates );
-               $this->doJobs();
-               $loadBalancer->saveMasterPos();
-               # Now commit any transactions, so that unreported errors after output() don't roll back the whole thing
-               $loadBalancer->commitAll();
+       function finalCleanup( &$output ) {
+               wfProfileIn( __METHOD__ );
+               // Now commit any transactions, so that unreported errors after
+               // output() don't roll back the whole DB transaction
+               $factory = wfGetLBFactory();
+               $factory->commitMasterChanges();
+               // Output everything!
                $output->output();
-               wfProfileOut( 'MediaWiki::finalCleanup' );
-       }
-
-       /**
-        * Deferred updates aren't really deferred anymore. It's important to report errors to the
-        * user, and that means doing this before OutputPage::output(). Note that for page saves,
-        * the client will wait until the script exits anyway before following the redirect.
-        */
-       function doUpdates ( &$updates ) {
-               wfProfileIn( 'MediaWiki::doUpdates' );
-               $dbw = wfGetDB( DB_MASTER );
-               foreach( $updates as $up ) {
-                       $up->doUpdate();
-
-                       # Commit after every update to prevent lock contention
-                       if ( $dbw->trxLevel() ) {
-                               $dbw->commit();
-                       }
-               }
-               wfProfileOut( 'MediaWiki::doUpdates' );
+               // Do any deferred jobs
+               wfDoUpdates( true );
+               $this->doJobs();
+               wfProfileOut( __METHOD__ );
        }
 
        /**
         * Do a job from the job queue
         */
        function doJobs() {
-               global $wgJobRunRate;
+               $jobRunRate = $this->getVal( 'JobRunRate' );
 
-               if ( $wgJobRunRate <= 0 || wfReadOnly() ) {
+               if( $jobRunRate <= 0 || wfReadOnly() ) {
                        return;
                }
-               if ( $wgJobRunRate < 1 ) {
+               if( $jobRunRate < 1 ) {
                        $max = mt_getrandmax();
-                       if ( mt_rand( 0, $max ) > $max * $wgJobRunRate ) {
+                       if( mt_rand( 0, $max ) > $max * $jobRunRate ) {
                                return;
                        }
                        $n = 1;
                } else {
-                       $n = intval( $wgJobRunRate );
+                       $n = intval( $jobRunRate );
                }
 
-               while ( $n-- && false != ($job = Job::pop())) {
+               while ( $n-- && false != ( $job = Job::pop() ) ) {
                        $output = $job->toString() . "\n";
                        $t = -wfTime();
                        $success = $job->run();
                        $t += wfTime();
                        $t = round( $t*1000 );
-                       if ( !$success ) {
+                       if( !$success ) {
                                $output .= "Error: " . $job->getLastError() . ", Time: $t ms\n";
                        } else {
                                $output .= "Success, Time: $t ms\n";
@@ -358,30 +425,59 @@ class MediaWiki {
        /**
         * Ends this task peacefully
         */
-       function restInPeace ( &$loadBalancer ) {
+       function restInPeace() {
                wfLogProfilingData();
-               $loadBalancer->closeAll();
+               // Commit and close up!
+               $factory = wfGetLBFactory();
+               $factory->commitMasterChanges();
+               $factory->shutdown();
                wfDebug( "Request ended normally\n" );
        }
 
        /**
         * Perform one of the "standard" actions
+        *
+        * @param $output OutputPage
+        * @param $article Article
+        * @param $title Title
+        * @param $user User
+        * @param $request WebRequest
         */
        function performAction( &$output, &$article, &$title, &$user, &$request ) {
+               wfProfileIn( __METHOD__ );
 
-               wfProfileIn( 'MediaWiki::performAction' );
+               if( !wfRunHooks( 'MediaWikiPerformAction', array( $output, $article, $title, $user, $request, $this ) ) ) {
+                       wfProfileOut( __METHOD__ );
+                       return;
+               }
 
-               $action = $this->getVal('Action');
-               if( in_array( $action, $this->getVal('DisabledActions',array()) ) ) {
+               $action = $this->getVal( 'Action' );
+               if( in_array( $action, $this->getVal( 'DisabledActions', array() ) ) ) {
                        /* No such action; this will switch to the default case */
                        $action = 'nosuchaction';
                }
 
+               // Workaround for bug #20966: inability of IE to provide an action dependent
+               // on which submit button is clicked.
+               if ( $action === 'historysubmit' ) {
+                       if ( $request->getBool( 'revisiondelete' ) ) {
+                               $action = 'revisiondelete';
+                       } else {
+                               $action = 'view';
+                       }
+               }
+
                switch( $action ) {
                        case 'view':
                                $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':
@@ -403,21 +499,20 @@ class MediaWiki {
                                if( !$this->getVal( 'EnableDublinCoreRdf' ) ) {
                                        wfHttpError( 403, 'Forbidden', wfMsg( 'nodublincore' ) );
                                } else {
-                                       require_once( 'includes/Metadata.php' );
-                                       wfDublinCoreRdf( $article );
+                                       $rdf = new DublinCoreRdf( $article );
+                                       $rdf->show();
                                }
                                break;
                        case 'creativecommons':
                                if( !$this->getVal( 'EnableCreativeCommonsRdf' ) ) {
                                        wfHttpError( 403, 'Forbidden', wfMsg( 'nocreativecommons' ) );
                                } else {
-                                       require_once( 'includes/Metadata.php' );
-                                       wfCreativeCommonsRdf( $article );
+                                       $rdf = new CreativeCommonsRdf( $article );
+                                       $rdf->show();
                                }
                                break;
                        case 'credits':
-                               require_once( 'includes/Credits.php' );
-                               showCreditsPage( $article );
+                               Credits::showPage( $article );
                                break;
                        case 'submit':
                                if( session_id() == '' ) {
@@ -426,6 +521,7 @@ class MediaWiki {
                                }
                                /* Continue... */
                        case 'edit':
+                       case 'editredlink':
                                if( wfRunHooks( 'CustomEditor', array( $article, $user ) ) ) {
                                        $internal = $request->getVal( 'internaledit' );
                                        $external = $request->getVal( 'externaledit' );
@@ -443,26 +539,24 @@ class MediaWiki {
                                }
                                break;
                        case 'history':
-                               global $wgRequest;
-                               if( $wgRequest->getFullRequestURL() == $title->getInternalURL( 'action=history' ) ) {
+                               if( $request->getFullRequestURL() == $title->getInternalURL( 'action=history' ) ) {
                                        $output->setSquidMaxage( $this->getVal( 'SquidMaxage' ) );
                                }
-                               $history = new PageHistory( $article );
+                               $history = new HistoryPage( $article );
                                $history->history();
                                break;
-                       case 'raw':
-                               $raw = new RawPage( $article );
-                               $raw->view();
+                       case 'revisiondelete':
+                               // For show/hide submission from history page
+                               $special = SpecialPage::getPage( 'Revisiondelete' );
+                               $special->execute( '' );
                                break;
                        default:
                                if( wfRunHooks( 'UnknownAction', array( $action, $article ) ) ) {
                                        $output->showErrorPage( 'nosuchaction', 'nosuchactiontext' );
                                }
                }
-               wfProfileOut( 'MediaWiki::performAction' );
+               wfProfileOut( __METHOD__ );
 
        }
 
-}; /* End of class MediaWiki */
-
-
+}