From: Chad Horohoe <demon@users.mediawiki.org>
Date: Tue, 3 Feb 2009 00:06:46 +0000 (+0000)
Subject: (bug 17330) Fix minor warning if $titles is null, which it can be.
X-Git-Tag: 1.31.0-rc.0~43062
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/password.php?a=commitdiff_plain;h=ec76ffecc1e14abf03338a169e69281477e570e9;p=lhc%2Fweb%2Fwiklou.git

(bug 17330) Fix minor warning if $titles is null, which it can be.
---

diff --git a/includes/Title.php b/includes/Title.php
index 8c3789779e..d665f2b001 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -315,7 +315,7 @@ class Title {
 	 */
 	public static function newFromRedirectRecurse( $text ) {
 		$titles = self::newFromRedirectArray( $text );
-		return array_pop( $titles );
+		return $titles ? array_pop( $titles ) : null;
 	}
 	
 	/**