From: Matthew Flaschen <mflaschen@wikimedia.org>
Date: Tue, 9 Jun 2015 20:55:50 +0000 (-0400)
Subject: Fix variants for OO UI images
X-Git-Tag: 1.31.0-rc.0~11133^2
X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=d8673b072d41b4955bf906e0509d4d6e7f8b26b9;p=lhc%2Fweb%2Fwiklou.git

Fix variants for OO UI images

Fixes T101895, caused by https://gerrit.wikimedia.org/r/#/c/212917/

Bug: T101895
Change-Id: Icd9af0d2eba2a62a1761cb9c9dcd90fc736c2b39
---

diff --git a/includes/resourceloader/ResourceLoaderOOUIImageModule.php b/includes/resourceloader/ResourceLoaderOOUIImageModule.php
index 6d76493a5f..ebbeb0153e 100644
--- a/includes/resourceloader/ResourceLoaderOOUIImageModule.php
+++ b/includes/resourceloader/ResourceLoaderOOUIImageModule.php
@@ -43,9 +43,16 @@ class ResourceLoaderOOUIImageModule extends ResourceLoaderImageModule {
 
 			if ( file_exists( $dataPath ) ) {
 				$data = json_decode( file_get_contents( $dataPath ), true );
-				array_walk_recursive( $data['images'], function ( &$path ) use ( $rootPath, $theme ) {
+				$fixPath = function ( &$path ) use ( $rootPath, $theme ) {
 					// TODO Allow extensions to specify this path somehow
 					$path = $rootPath . '/' . $theme . '/' . $path;
+				};
+				array_walk( $data['images'], function ( &$value ) use ( $fixPath ) {
+					if ( is_string( $value['file'] ) ) {
+						$fixPath( $value['file'] );
+					} else if ( is_array( $value['file'] ) ) {
+						array_walk_recursive( $value['file'], $fixPath );
+					}
 				} );
 			} else {
 				$data = array();