prevent crashing on [[{{FNORD}}]]. Doesn't return something beautiful, though.

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 54db1f4..e962f04 100644 (file)
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -807,6 +807,12 @@ class OutputPage {
                                # Make title object
                                $dbk = $dbkeys[$key];
                                $title = $titles[$key] = Title::makeTitle( $val, $dbk );
+
+                               # Skip invalid entries.
+                               # Result will be ugly, but prevents crash.
+                               if ( is_null( $title ) ) {
+                                       continue;
+                               }
                                $pdbk = $pdbks[$key] = $title->getPrefixedDBkey();
 
                                # Check if it's in the link cache already

diff --git a/includes/Skin.php b/includes/Skin.php
index bfda48b..dc69734 100644 (file)
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -1580,6 +1580,10 @@ class Skin {
        {
                global $wgOut, $wgUser;
 
+               # Fail gracefully
+               if ( ! isset($nt) )
+                       return "<!-- ERROR -->{$prefix}{$text}{$trail}";
+
                $fname = 'Skin::makeBrokenLinkObj';
                wfProfileIn( $fname );