r94743 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r94742‎ | r94743 | r94744 >
Date:11:36, 17 August 2011
Author:vasilievvv
Status:deferred
Tags:
Comment:
Make addition of list and non-list symmetrical.
Modified paths:
  • /trunk/extensions/WikiScripts/interpreter/Data.php (modified) (history)

Diff [purge]

Index: trunk/extensions/WikiScripts/interpreter/Data.php
@@ -224,6 +224,8 @@
225225 return new WSData( self::DList, array_merge( $a->toList(), $b->toList() ) );
226226 elseif( $a->type == self::DList )
227227 return new WSData( self::DList, array_merge( $a->toList(), array( $b ) ) );
 228+ elseif( $b->type == self::DList )
 229+ return new WSData( self::DList, array_merge( array( $a ), $b->toList() ) );
228230 elseif( $a->type == self::DAssoc && $b->type == self::DAssoc )
229231 return new WSData( self::DAssoc, array_merge( $a->toAssoc(), $b->toAssoc() ) );
230232 elseif( $a->type == self::DInt && $b->type == self::DInt )

Status & tagging log