$ret = Title::newFromURL( $title );
// 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 ){
+ if ( count( $wgContLang->getVariants() ) > 1
+ && !is_null( $ret ) && $ret->getArticleID() == 0 )
+ {
$wgContLang->findVariantLink( $title, $ret );
}
}
}
}
- if( $ret === null || ( $ret->getDBkey() == '' && $ret->getInterwiki() == '' ) ){
- $ret = new BadTitle;
+ if ( $ret === null || ( $ret->getDBkey() == '' && $ret->getInterwiki() == '' ) ) {
+ $ret = SpecialPage::getTitleFor( 'Badtitle' );
}
+
return $ret;
}
*
* @return void
*/
- public function performRequest() {
+ private function performRequest() {
global $wgServer, $wgUsePathInfo;
wfProfileIn( __METHOD__ );
array( &$title, null, &$output, &$user, $request, $this ) );
// Invalid titles. Bug 21776: The interwikis must redirect even if the page name is empty.
- if ( $title instanceof BadTitle ) {
+ if ( is_null( $title ) || ( ( $title->getDBkey() == '' ) && ( $title->getInterwiki() == '' ) ) ) {
+ $this->context->title = SpecialPage::getTitleFor( 'Badtitle' );
throw new ErrorPageError( 'badtitle', 'badtitletext' );
// 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
$url = $title->getFullURL( $query );
}
// Check for a redirect loop
- if ( !preg_match( '/^' . preg_quote( $wgServer, '/' ) . '/', $url ) && $title->isLocal() ) {
+ if ( !preg_match( '/^' . preg_quote( $wgServer, '/' ) . '/', $url )
+ && $title->isLocal() )
+ {
// 301 so google et al report the target as the actual url.
$output->redirect( $url, 301 );
} else {
- $this->context->setTitle( new BadTitle );
+ $this->context->setTitle( SpecialPage::getTitleFor( 'Badtitle' ) );
wfProfileOut( __METHOD__ );
throw new ErrorPageError( 'badtitle', 'badtitletext' );
}
// Redirect loops, no title in URL, $wgUsePathInfo URLs, and URLs with a variant
} elseif ( $request->getVal( 'action', 'view' ) == 'view' && !$request->wasPosted()
- && ( $request->getVal( 'title' ) === null || $title->getPrefixedDBKey() != $request->getVal( 'title' ) )
- && !count( array_diff( array_keys( $request->getValues() ), array( 'action', 'title' ) ) ) )
+ && ( $request->getVal( 'title' ) === null ||
+ $title->getPrefixedDBKey() != $request->getVal( 'title' ) )
+ && !count( $request->getValueNames( array( 'action', 'title' ) ) ) )
{
if ( $title->getNamespace() == NS_SPECIAL ) {
list( $name, $subpage ) = SpecialPageFactory::resolveAlias( $title->getDBkey() );
$title = SpecialPage::getTitleFor( $name, $subpage );
}
}
- $targetUrl = $title->getFullURL();
+ $targetUrl = wfExpandUrl( $title->getFullURL(), PROTO_CURRENT );
// Redirect to canonical url, make it a 301 to allow caching
if ( $targetUrl == $request->getFullRequestURL() ) {
$message = "Redirect loop detected!\n\n" .
/**
* $wgArticle is deprecated, do not use it. This will possibly be removed
* entirely in 1.20 or 1.21
- * @deprecated since 1.19
+ * @deprecated since 1.18
*/
global $wgArticle;
$wgArticle = $article;
/**
* Create an Article object of the appropriate class for the given page.
*
- * @deprecated in 1.19; use Article::newFromTitle() instead
+ * @deprecated in 1.18; use Article::newFromTitle() instead
* @param $title Title
* @param $context RequestContext
* @return Article object
}
/**
- * Returns the action that will be executed, not necesserly the one passed
+ * Returns the action that will be executed, not necessarily the one passed
* passed through the "action" parameter. Actions disabled in
* $wgDisabledActions will be replaced by "nosuchaction"
*
$this->context->setTitle( $article->getTitle() );
}
}
+
wfProfileOut( __METHOD__ );
return $article;
}
// Output everything!
$this->context->getOutput()->output();
// Do any deferred jobs
- wfDoUpdates( 'commit' );
+ DeferredUpdates::doUpdates( 'commit' );
$this->doJobs();
wfProfileOut( __METHOD__ );
}
*
* @param $article Article
*/
- private function performAction( Article $article ) {
+ private function performAction( Page $article ) {
global $wgSquidMaxage, $wgUseExternalEditor;
wfProfileIn( __METHOD__ );
$act = $this->getAction();
$action = Action::factory( $act, $article );
- if( $action instanceof Action ){
+ if ( $action instanceof Action ) {
$action->show();
wfProfileOut( __METHOD__ );
return;
wfProfileOut( __METHOD__ . '-raw' );
break;
case 'delete':
- case 'revert':
- case 'rollback':
case 'protect':
case 'unprotect':
case 'render':
$section = $request->getVal( 'section' );
$oldid = $request->getVal( 'oldid' );
if ( !$wgUseExternalEditor || $act == 'submit' || $internal ||
- $section || $oldid || ( !$user->getOption( 'externaleditor' ) && !$external ) ) {
+ $section || $oldid ||
+ ( !$user->getOption( 'externaleditor' ) && !$external ) )
+ {
$editor = new EditPage( $article );
$editor->submit();
- } elseif ( $wgUseExternalEditor && ( $external || $user->getOption( 'externaleditor' ) ) ) {
+ } elseif ( $wgUseExternalEditor
+ && ( $external || $user->getOption( 'externaleditor' ) ) )
+ {
$mode = $request->getVal( 'mode' );
- $extedit = new ExternalEdit( $article, $mode );
+ $extedit = new ExternalEdit( $article->getTitle(), $mode );
$extedit->edit();
}
}
* Run the current MediaWiki instance
* index.php just calls this
*/
- function run() {
+ public function run() {
try {
$this->checkMaxLag( true );
$this->main();
* script execution. False to return the result as a boolean.
* @return boolean True if we passed the check, false if we surpass the maxlag
*/
- function checkMaxLag( $abort ) {
+ private function checkMaxLag( $abort ) {
global $wgShowHostnames;
wfProfileIn( __METHOD__ );
list( $host, $lag ) = $lb->getMaxLag();
if ( $lag > $maxLag ) {
if ( $abort ) {
- 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' );
+ $resp = $this->context->getRequest()->response();
+ $resp->header( 'HTTP/1.1 503 Service Unavailable' );
+ $resp->header( 'Retry-After: ' . max( intval( $maxLag ), 5 ) );
+ $resp->header( 'X-Database-Lag: ' . intval( $lag ) );
+ $resp->header( 'Content-Type: text/plain' );
if( $wgShowHostnames ) {
echo "Waiting for $host: $lag seconds lagged\n";
} else {
wfProfileOut( __METHOD__ );
- if ( !$abort )
+ if ( !$abort ) {
return false;
+ }
exit;
}
}
return true;
}
- function main() {
+ private function main() {
global $wgUseFileCache, $wgTitle, $wgUseAjax;
wfProfileIn( __METHOD__ );
# Set title from request parameters
$wgTitle = $this->getTitle();
$action = $this->getAction();
+ $user = $this->context->getUser();
# Send Ajax requests to the Ajax dispatcher.
if ( $wgUseAjax && $action == 'ajax' ) {
$cache = new HTMLFileCache( $wgTitle, $action );
if ( $cache->isFileCacheGood( /* Assume up to date */ ) ) {
/* Check incoming headers to see if client has this cached */
- if ( !$this->context->getOutput()->checkLastModified( $cache->fileCacheTime() ) ) {
+ $timestamp = $cache->fileCacheTime();
+ if ( !$this->context->getOutput()->checkLastModified( $timestamp ) ) {
$cache->loadFromFileCache();
}
# Do any stats increment/watchlist stuff
- $article = Article::newFromTitle( $wgTitle, $this->context );
- $article->viewUpdates();
+ $article = WikiPage::factory( $wgTitle );
+ $article->doViewUpdates( $user );
# Tell OutputPage that output is taken care of
$this->context->getOutput()->disable();
wfProfileOut( 'main-try-filecache' );
dépôts / lhc / web / wiklou.git / blobdiff