* random redirect-related fixes:

** automatically add redirect=no to all links on the redirect page in Article::viewRedirect.
** properly check if redirects are enabled if $wgMaxRedirects < 1 (moved check from Title::newFromRedirectArray to Title::newFromRedirectInternal).

diff --git a/includes/Article.php b/includes/Article.php
index 6504d3a..1d8f68b 100644 (file)
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -1564,13 +1564,12 @@ class Article {
                $nextRedirect = $wgStylePath . '/common/images/nextredirect' . $imageDir . '.png';
                $alt = $wgContLang->isRTL() ? '←' : '→';
                // Automatically append redirect=no to each link, since most of them are redirect pages themselves.
-               // FIXME: where this happens?
                foreach ( $target as $rt ) {
                        $link .= Html::element( 'img', array( 'src' => $nextRedirect, 'alt' => $alt ) );
                        if ( $forceKnown ) {
-                               $link .= $sk->linkKnown( $rt, htmlspecialchars( $rt->getFullText() ) );
+                               $link .= $sk->linkKnown( $rt, htmlspecialchars( $rt->getFullText(), array(), array( 'redirect' => 'no' ) ) );
                        } else {
-                               $link .= $sk->link( $rt, htmlspecialchars( $rt->getFullText() ) );
+                               $link .= $sk->link( $rt, htmlspecialchars( $rt->getFullText() ), array(), array( 'redirect' => 'no' ) );
                        }
                }
 

diff --git a/includes/Title.php b/includes/Title.php
index e2e8dee..409467b 100644 (file)
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -359,10 +359,6 @@ class Title {
         */
        public static function newFromRedirectArray( $text ) {
                global $wgMaxRedirects;
-               // are redirects disabled?
-               if ( $wgMaxRedirects < 1 ) {
-                       return null;
-               }
                $title = self::newFromRedirectInternal( $text );
                if ( is_null( $title ) ) {
                        return null;
@@ -397,6 +393,11 @@ class Title {
         * @return Title
         */
        protected static function newFromRedirectInternal( $text ) {
+               global $wgMaxRedirects;
+               if ( $wgMaxRedirects < 1 ) {
+                       //redirects are disabled, so quit early
+                       return null;
+               }
                $redir = MagicWord::get( 'redirect' );
                $text = trim( $text );
                if ( $redir->matchStartAndRemove( $text ) ) {