X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=blobdiff_plain;f=includes%2FWiki.php;h=6ecbc39ebaeb17c0d902c64d700b340428efbd02;hb=62dd3d9fb66ddfa64a2bc206442ff7599054907b;hp=6e96fba48b6dbd389363796dc0f93433830d158d;hpb=0356a3893473463868a85efd52b47f4539a53e55;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/Wiki.php b/includes/Wiki.php index 6e96fba48b..6ecbc39eba 100644 --- a/includes/Wiki.php +++ b/includes/Wiki.php @@ -49,11 +49,19 @@ class MediaWiki { * @param $user User * @param $request WebRequest */ - function initialize( &$title, &$article, &$output, &$user, $request ) { + function performRequestForTitle( &$title, &$article, &$output, &$user, $request ) { wfProfileIn( __METHOD__ ); - $this->preliminaryChecks( $title, $output, $request ); + + $output->setTitle( $title ); + + wfRunHooks( 'BeforeInitialize', array( &$title, &$article, &$output, &$user, $request, $this ) ); + + if( !$this->preliminaryChecks( $title, $output, $request ) ) { + wfProfileOut( __METHOD__ ); + return; + } if( !$this->initializeSpecialCases( $title, $output, $request ) ) { - $new_article = $this->initializeArticle( $title, $request ); + $new_article = $this->initializeArticle( $title, $output, $request ); if( is_object( $new_article ) ) { $article = $new_article; $this->performAction( $output, $article, $title, $user, $request ); @@ -85,7 +93,6 @@ class MediaWiki { } } - /** * Checks some initial queries * Note that $title here is *not* a Title object, but a string! @@ -109,15 +116,18 @@ class MediaWiki { $ret = Title::newFromURL( $title ); // check variant links so that interwiki links don't have to worry // about the possible different language variants - if( !is_null($ret) && $wgContLang->hasVariants() && $ret->getArticleID() == 0 ) + 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,10 +153,13 @@ class MediaWiki { # 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() ) { + global $wgDeferredUpdateList; $output->loginToUse(); - $output->output(); - exit; + $this->finalCleanup( $wgDeferredUpdateList, $output ); + $output->disable(); + return false; } + return true; } /** @@ -156,6 +169,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 @@ -173,7 +188,9 @@ class MediaWiki { if( $rdfrom = $request->getVal( '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() ) { @@ -218,26 +235,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__ ); - $this->restInPeace(); - exit; - } - } /* No match to special cases */ wfProfileOut( __METHOD__ ); return false; @@ -280,15 +277,21 @@ class MediaWiki { * Create an Article object for the page, following redirects if needed. * * @param $title Title ($wgTitle) - * @param $request WebRequest + * @param $output OutputPage ($wgOut) + * @param $request WebRequest ($wgRequest) * @return mixed an Article, or a string to redirect to another URL */ - function initializeArticle( &$title, $request ) { + function initializeArticle( &$title, &$output, $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; @@ -307,8 +310,9 @@ class MediaWiki { wfRunHooks( 'InitializeArticleMaybeRedirect', array(&$title,&$request,&$ignoreRedirect,&$target,&$article) ); - // Follow redirects only for... redirects - if( !$ignoreRedirect && $article->isRedirect() ) { + // 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 ) ) { @@ -317,8 +321,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 ) ); @@ -326,6 +329,7 @@ class MediaWiki { $rarticle->setRedirectedFrom( $title ); $article = $rarticle; $title = $target; + $output->setTitle( $title ); } } } else { @@ -337,14 +341,16 @@ class MediaWiki { } /** - * Cleaning up by doing deferred updates, calling LBFactory and doing the output + * Cleaning up request by doing: + ** deferred updates, DB transaction, and the output * * @param $deferredUpdates array of updates to do * @param $output OutputPage */ function finalCleanup( &$deferredUpdates, &$output ) { wfProfileIn( __METHOD__ ); - # Now commit any transactions, so that unreported errors after output() don't roll back the whole thing + # Now commit any transactions, so that unreported errors after + # output() don't roll back the whole DB transaction $factory = wfGetLBFactory(); $factory->commitMasterChanges(); # Output everything! @@ -352,8 +358,6 @@ class MediaWiki { # Do any deferred jobs $this->doUpdates( $deferredUpdates ); $this->doJobs(); - # Commit and close up! - $factory->shutdown(); wfProfileOut( __METHOD__ ); } @@ -368,7 +372,7 @@ class MediaWiki { function doUpdates( &$updates ) { wfProfileIn( __METHOD__ ); /* No need to get master connections in case of empty updates array */ - if( !$updates ) { + if (!$updates) { wfProfileOut( __METHOD__ ); return; } @@ -424,6 +428,10 @@ class MediaWiki { */ function restInPeace() { wfLogProfilingData(); + # Commit and close up! + $factory = wfGetLBFactory(); + $factory->commitMasterChanges(); + $factory->shutdown(); wfDebug( "Request ended normally\n" ); } @@ -456,8 +464,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': @@ -523,9 +533,14 @@ class MediaWiki { if( $request->getFullRequestURL() == $title->getInternalURL( 'action=history' ) ) { $output->setSquidMaxage( $this->getVal( 'SquidMaxage' ) ); } - $history = new PageHistory( $article ); + $history = new HistoryPage( $article ); $history->history(); break; + 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' );