From f5f3ea633abdb4a841d7e0a54497125725b866e0 Mon Sep 17 00:00:00 2001 From: Sam Reed Date: Thu, 6 Jan 2011 03:21:01 +0000 Subject: [PATCH] Fixup minor FIXME on r66724 --- includes/filerepo/ForeignAPIFile.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) 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 ); } -- 2.20.1