http://www.mediawiki.org/wiki/Special:Code/MediaWiki/73201
Revision: 73201
Author: daniel
Date: 2010-09-17 09:03:35 +0000 (Fri, 17 Sep 2010)
Log Message:
-----------
fix merge for uninitialized fields
Modified Paths:
--------------
trunk/extensions/DataTransclusion/MAB2RecordTransformer.php
Modified: trunk/extensions/DataTransclusion/MAB2RecordTransformer.php
===================================================================
--- trunk/extensions/DataTransclusion/MAB2RecordTransformer.php 2010-09-17
08:56:07 UTC (rev 73200)
+++ trunk/extensions/DataTransclusion/MAB2RecordTransformer.php 2010-09-17
09:03:35 UTC (rev 73201)
@@ -97,7 +97,11 @@
if ( !empty( $rec[ $item ] ) ) {
if ( is_array( $rec[ $item ] ) ) {
- $r[ $field ] = array_merge( $r[ $field ], $rec[
$item ] );
+ if ( empty( $r[ $field ] ) ) {
+ $r[ $field ] = $rec[ $item ];
+ } else {
+ $r[ $field ] = array_merge( $r[ $field ],
$rec[ $item ] );
+ }
} else {
$r[ $field ][] = $rec[ $item ];
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
