fixes from live site

diff --git a/includes/Parser.php b/includes/Parser.php
index f7e9415..43db09a 100644 (file)
--- 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 91dd6c2..9345471 100644 (file)
--- 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;