* Stores key/value pairs to circumvent global variables
* Note that keys are case-insensitive!
*
- * @param String $key key to store
- * @param mixed $value value to put for the key
+ * @param $key String: key to store
+ * @param $value Mixed: value to put for the key
*/
function setVal( $key, &$value ) {
$key = strtolower( $key );
* Retrieves key/value pairs to circumvent global variables
* Note that keys are case-insensitive!
*
- * @param String $key key to get
- * @param mixed $default default value if if the key doesn't exist
+ * @param $key String: key to get
+ * @param $default Mixed: default value if if the key doesn't exist
*/
function getVal( $key, $default = '' ) {
$key = strtolower( $key );
* Initialization of ... everything
* Performs the request too
*
- * @param Title $title
- * @param Article $article
- * @param OutputPage $output
- * @param User $user
- * @param WebRequest $request
+ * @param $title Title ($wgTitle)
+ * @param $article Article
+ * @param $output OutputPage
+ * @param $user User
+ * @param $request WebRequest
*/
function initialize( &$title, &$article, &$output, &$user, $request ) {
wfProfileIn( __METHOD__ );
* Check if the maximum lag of database slaves is higher that $maxLag, and
* if it's the case, output an error message
*
- * @param int $maxLag maximum lag allowed for the request, as supplied by
- * the client
+ * @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 ) {
* Checks some initial queries
* Note that $title here is *not* a Title object, but a string!
*
- * @param String $title
- * @param String $action
+ * @param $title String
+ * @param $action String
* @return Title object to be $wgTitle
*/
function checkInitialQueries( $title, $action ) {
/**
* Checks for search query and anon-cannot-read case
*
- * @param Title $title
- * @param OutputPage $output
- * @param WebRequest $request
+ * @param $title Title
+ * @param $output OutputPage
+ * @param $request WebRequest
*/
function preliminaryChecks( &$title, &$output, $request ) {
// 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' );
}
* - redirect loop
* - special pages
*
- * @param Title $title
- * @param OutputPage $output
- * @param WebRequest $request
+ * @param $title Title
+ * @param $output OutputPage
+ * @param $request WebRequest
* @return bool true if the request is already executed
*/
function initializeSpecialCases( &$title, &$output, $request ) {
$title = SpecialPage::getTitleFor( 'Badtitle' );
throw new ErrorPageError( 'badtitle', 'badtitletext' );
}
- } else if ( ( $action == 'view' ) && !$request->wasPosted() &&
+ } else if ( ( $action == 'view' ) && !$request->wasPosted() &&
(!isset( $this->GET['title'] ) || $title->getPrefixedDBKey() != $this->GET['title'] ) &&
!count( array_diff( array_keys( $this->GET ), array( 'action', 'title' ) ) ) )
{
/**
* Create an Article object of the appropriate class for the given page.
*
- * @param Title $title
+ * @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() );
}
+ $article = null;
+ wfRunHooks( 'ArticleFromTitle', array( &$title, &$article ) );
+ if( $article ) {
+ return $article;
+ }
+
switch( $title->getNamespace() ) {
case NS_IMAGE:
- $file = wfFindFile( $title );
- if( $file && $file->getRedirected() ) {
- return new Article( $title );
- }
return new ImagePage( $title );
case NS_CATEGORY:
return new CategoryPage( $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 $request WebRequest
* @return mixed an Article, or a string to redirect to another URL
*/
function initializeArticle( &$title, $request ) {
$action = $this->getVal( 'action' );
$article = self::articleFromTitle( $title );
-
+
+ wfDebug("Article: ".$title->getPrefixedText()."\n");
+
// Namespace might change when using redirects
- if( ( $action == 'view' || $action == 'render' ) && !$request->getVal( 'oldid' ) &&
- $request->getVal( 'redirect' ) != 'no' &&
- !( $title->getNamespace() == NS_IMAGE && wfFindFile( $title->getText() ) ) ) {
+ // Check for redirects ...
+ $file = $title->getNamespace() == NS_IMAGE ? $article->getFile() : null;
+ if( ( $action == 'view' || $action == 'render' ) // ... for actions that show content
+ && !$request->getVal( 'oldid' ) && // ... and are not old revisions
+ $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;
+ wfRunHooks( 'InitializeArticleMaybeRedirect', array( &$title, &$request, &$ignoreRedirect, &$target ) );
$dbr = wfGetDB( DB_SLAVE );
$article->loadPageData( $article->pageDataFromTitle( $dbr, $title ) );
// Follow redirects only for... redirects
- if( $article->mIsRedirect ) {
- $target = $article->followRedirect();
+ if( !$ignoreRedirect && $article->isRedirect() ) {
+ # Is the target already set by an extension?
+ $target = $target ? $target : $article->followRedirect();
if( is_string( $target ) ) {
if( !$this->getVal( 'DisableHardRedirects' ) ) {
// we'll need to redirect
return $target;
}
}
+
if( is_object( $target ) ) {
// Rewrite environment to redirected article
$rarticle = self::articleFromTitle( $target );
$rarticle->loadPageData( $rarticle->pageDataFromTitle( $dbr, $target ) );
- if ( $rarticle->mTitle->exists() ) {
+ if ( $rarticle->exists() || ( is_object( $file ) && !$file->isLocal() ) ) {
$rarticle->setRedirectedFrom( $title );
$article = $rarticle;
$title = $target;
}
}
} else {
- $title = $article->mTitle;
+ $title = $article->getTitle();
}
}
wfProfileOut( __METHOD__ );
/**
* Cleaning up by doing deferred updates, calling LBFactory and doing the output
*
- * @param Array $deferredUpdates array of updates to do
- * @param OutputPage $output
+ * @param $deferredUpdates array of updates to do
+ * @param $output OutputPage
*/
function finalCleanup ( &$deferredUpdates, &$output ) {
wfProfileIn( __METHOD__ );
* Note that for page saves, the client will wait until the script exits
* anyway before following the redirect.
*
- * @param Array $updates array of objects that hold an update to do
+ * @param $updates array of objects that hold an update to do
*/
function doUpdates( &$updates ) {
wfProfileIn( __METHOD__ );
wfProfileOut( __METHOD__ );
return;
}
-
+
$dbw = wfGetDB( DB_MASTER );
foreach( $updates as $up ) {
$up->doUpdate();
/**
* Perform one of the "standard" actions
*
- * @param OutputPage $output
- * @param Article $article
- * @param Title $title
- * @param User $user
- * @param WebRequest $request
+ * @param $output OutputPage
+ * @param $article Article
+ * @param $title Title
+ * @param $user User
+ * @param $request WebRequest
*/
function performAction( &$output, &$article, &$title, &$user, &$request ) {
wfProfileIn( __METHOD__ );
- if ( !wfRunHooks( 'MediaWikiPerformAction', array( $output, $article, $title, $user, $request ) ) ) {
+ if ( !wfRunHooks( 'MediaWikiPerformAction', array( $output, $article, $title, $user, $request, $this ) ) ) {
wfProfileOut( __METHOD__ );
return;
}
}
}; /* End of class MediaWiki */
-
dépôts / lhc / web / wiklou.git / blobdiff