r79708 MediaWiki - Code Review archive

PHP Notice: Undefined index: redirects in /www/w/includes/filerepo/ForeignAPIFile.php on line 34

Wondering if this might be the best solution:

		if( $info ) {
			if ( isset( $data['query']['redirects'] ) ) {
				$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() );
					}
				}
			} else {
				$img = new ForeignAPIFile( $title, $repo, $info, true );
			}
			return $img;
		} else {
			return null;
		}

Except that'd make $img undefined in some cases

/sigh

		if( $info ) {
			$lastRedirect = isset( $data['query']['redirects'] )
				? count( $data['query']['redirects'] ) - 1
				: -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() );
				}
			} else {
				$img = new ForeignAPIFile( $title, $repo, $info, true );
			}
			return $img;
		} else {
			return null;
		}

Please describe in your commit summary what you fixed, not only that you fixed something. Not specifying what you have fixed makes reviewing much harder.