From: Sam Reed <reedy@users.mediawiki.org>
Date: Thu, 6 Jan 2011 03:21:01 +0000 (+0000)
Subject: Fixup minor FIXME on r66724
X-Git-Tag: 1.31.0-rc.0~32774
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22config_fonctions%22%2C%20%22image_process=%24process%22%29%20.%20%22?a=commitdiff_plain;h=f5f3ea633abdb4a841d7e0a54497125725b866e0;p=lhc%2Fweb%2Fwiklou.git

Fixup minor FIXME on r66724
---

diff --git a/includes/filerepo/ForeignAPIFile.php b/includes/filerepo/ForeignAPIFile.php
index 9869188721..055d3784a6 100644
--- a/includes/filerepo/ForeignAPIFile.php
+++ b/includes/filerepo/ForeignAPIFile.php
@@ -30,11 +30,14 @@ class ForeignAPIFile extends File {
 
 		$info = $repo->getImageInfo( $data );
 
-		if( $data && $info) {
-			if( isset( $data['query']['redirects'][0] ) ) {
-				$newtitle = Title::newFromText( $data['query']['redirects'][0]['to']);
+		if( $info ) {
+			$lastRedirect = count( $data['query']['redirects'] ) - 1;
+			if( $lastRedirect >= 0 ) {
+				$newtitle = Title::newFromText( $data['query']['redirects'][$lastRedirect]['to']);
 				$img = new ForeignAPIFile( $newtitle, $repo, $info, true );
-				if( $img ) $img->redirectedFrom( $title->getDBkey() );
+				if( $img ) {
+					$img->redirectedFrom( $title->getDBkey() );
+				}
 			} else {
 				$img = new ForeignAPIFile( $title, $repo, $info, true );
 			}