wikimedia/mediawiki-extensions-Echo
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Echo synced 2024-11-30 18:45:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Illegal string offset 'ltr' in ResourceLoaderEchoImageModule.php

Browse source 
Make $paths an array.

@Krinkle came up with this fix. I just uploaded the patch.

Bug: T161420
Change-Id: I709808bfb0e620f7808175dc272fd57e88b663f5
This commit is contained in:
Paladox 2017-03-27 23:29:48 +00:00
parent 7749ac4684
commit ecae781538
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
includes/ResourceLoaderEchoImageModule.php
View file

@ -37,9 +37,9 @@ class ResourceLoaderEchoImageModule extends ResourceLoaderImageModule {
foreach ( $this->definition['icons'] as $iconName => $definition ) { foreach ( $this->definition['icons'] as $iconName => $definition ) {
// FIXME: We also have a 'site' icon which is "magical" // FIXME: We also have a 'site' icon which is "magical"
// and uses witchcraft and should be handled specifically // and uses witchcraft and should be handled specifically
$paths = '';
if ( isset( $definition[ 'path' ] ) ) { if ( isset( $definition[ 'path' ] ) ) {
if ( is_array( $definition[ 'path' ] ) ) { if ( is_array( $definition[ 'path' ] ) ) {
$paths = [];
foreach ( $definition[ 'path' ] as $dir => $p ) { foreach ( $definition[ 'path' ] as $dir => $p ) {
// Has both rtl and ltr definitions // Has both rtl and ltr definitions
$paths[ $dir ] = $p; $paths[ $dir ] = $p;