Guard against
authorSam Reed <reedy@users.mediawiki.org>
Thu, 22 Sep 2011 15:08:32 +0000 (15:08 +0000)
committerSam Reed <reedy@users.mediawiki.org>
Thu, 22 Sep 2011 15:08:32 +0000 (15:08 +0000)
PHP fatal error in /home/wikipedia/common/php-1.18/includes/Linker.php line 831:
Argument 1 passed to Linker::makeMediaLinkObj() must be an instance of Title, null given, called in /home/wikipedia/common/php-1.18/includes/Linker.php on line 1221 and defined

includes/Linker.php

index 84ede27..6d264c3 100644 (file)
@@ -1234,7 +1234,9 @@ class Linker {
                        # Media link; trail not supported.
                        $linkRegexp = '/\[\[(.*?)\]\]/';
                        $title = Title::makeTitleSafe( NS_FILE, $submatch[1] );
-                       $thelink = self::makeMediaLinkObj( $title, $text );
+                       if ( $title ) {
+                               $thelink = self::makeMediaLinkObj( $title, $text );
+                       }
                } else {
                        # Other kind of link
                        if ( preg_match( $wgContLang->linkTrail(), $match[4], $submatch ) ) {