Fixup minor FIXME on r66724
authorSam Reed <reedy@users.mediawiki.org>
Thu, 6 Jan 2011 03:21:01 +0000 (03:21 +0000)
committerSam Reed <reedy@users.mediawiki.org>
Thu, 6 Jan 2011 03:21:01 +0000 (03:21 +0000)
includes/filerepo/ForeignAPIFile.php

index 9869188..055d378 100644 (file)
@@ -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 );
                        }