From 847ef6554b2ba4c08b027766cf6b1ce24afe2fdd Mon Sep 17 00:00:00 2001 From: River Tarnell Date: Sun, 3 Jul 2005 07:39:49 +0000 Subject: [PATCH] fixes from live site --- includes/Parser.php | 10 ++++++---- includes/Title.php | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/includes/Parser.php b/includes/Parser.php index f7e9415b48..43db09a789 100644 --- a/includes/Parser.php +++ b/includes/Parser.php @@ -2203,10 +2203,12 @@ class Parser } $title = Title::newFromText( $part1, $ns ); - $interwiki = Title::getInterwikiLink($title->getInterwiki()); - if ($interwiki != '' && $title->isTrans()) { - return $this->scarytransclude($title, $interwiki); - } + if ($title) { + $interwiki = Title::getInterwikiLink($title->getInterwiki()); + if ($interwiki != '' && $title->isTrans()) { + return $this->scarytransclude($title, $interwiki); + } + } if ( !is_null( $title ) && !$title->isExternal() ) { # Check for excessive inclusion diff --git a/includes/Title.php b/includes/Title.php index 91dd6c2e91..9345471ca6 100644 --- a/includes/Title.php +++ b/includes/Title.php @@ -399,7 +399,7 @@ class Title { $s = $wgMemc->get( $k ); # Ignore old keys with no iw_local - if( $s && isset( $s->iw_local ) ) { + if( $s && isset( $s->iw_local ) && isset($s->iw_trans)) { $wgTitleInterwikiCache[$k] = $s; wfProfileOut( $fname ); return $s->iw_url; -- 2.20.1