* Added a hook to allow extensions to modify the redirect behaviour

diff --git a/includes/Article.php b/includes/Article.php
index f4de39e..a0a0f8d 100644 (file)
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -760,14 +760,14 @@ class Article {
                                $wgOut->setRobotpolicy( 'noindex,follow' );
                        }
                        if ( '' != $this->mRedirectedFrom ) {
-                               $sk = $wgUser->getSkin();
-                               $redir = $sk->makeKnownLink( $this->mRedirectedFrom, '',
-                                 'redirect=no' );
-                               $s = wfMsg( 'redirectedfrom', $redir );
-                               $wgOut->setSubtitle( $s );
-
-                               # Can't cache redirects
-                               $pcache = false;
+                               if ( wfRunHooks( 'ArticleViewRedirect', array( &$this ) ) ) {
+                                       $sk = $wgUser->getSkin();
+                                       $redir = $sk->makeKnownLink( $this->mRedirectedFrom, '', 'redirect=no' );
+                                       $s = wfMsg( 'redirectedfrom', $redir );
+                                       $wgOut->setSubtitle( $s );
+                                       # Can't cache redirects
+                                       $pcache = false;
+                               }
                        } elseif ( !empty( $rdfrom ) ) {
                                global $wgRedirectSources;
                                if( $wgRedirectSources && preg_match( $wgRedirectSources, $rdfrom ) ) {