From 75ff889020cc81d840bb9963a50bbbb47a41d6df Mon Sep 17 00:00:00 2001 From: Matt Johnston Date: Mon, 13 Oct 2008 09:31:46 +0000 Subject: [PATCH] Fix r42022, always returning true for isValidInterwiki as I forgot to add the check. --- includes/Interwiki.php | 6 ++++-- includes/Title.php | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/includes/Interwiki.php b/includes/Interwiki.php index 9bd33eac75..33e69a189e 100644 --- a/includes/Interwiki.php +++ b/includes/Interwiki.php @@ -50,7 +50,7 @@ class Interwiki { unset( self::$smCache[ key( self::$smCache ) ] ); } self::$smCache[$prefix] = $iw; - return true; + return ($iw != false); } /** @@ -175,7 +175,9 @@ class Interwiki { $iw = false; if( $mc && is_array( $mc ) ){ // is_array is hack for old keys $iw = Interwiki::loadFromArray( $mc ); - return $iw; + if( $iw ){ + return $iw; + } } $db = wfGetDB( DB_SLAVE ); diff --git a/includes/Title.php b/includes/Title.php index 36d0f2ce9c..47e68b21bb 100644 --- a/includes/Title.php +++ b/includes/Title.php @@ -675,7 +675,7 @@ class Title { $query = wfArrayToCGI( $query ); } - if ( '' == $this->mInterwiki ) { + if ( '' == $this->mInterwiki || !Interwiki::isValidInterwiki( $this->mInterwiki ) ) { $url = $this->getLocalUrl( $query, $variant ); // Ugly quick hack to avoid duplicate prefixes (bug 4571 etc) -- 2.20.1