From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Sun, 21 Nov 2010 17:02:12 +0000 (+0000)
Subject: Per Reedy, follow-up to r77072: don't use array_merge() to add just one item
X-Git-Tag: 1.31.0-rc.0~33787
X-Git-Url: http://git.cyclocoop.org/%24action?a=commitdiff_plain;h=05d2ef0db2a02fd54d9ea5b72e28564827d0b319;p=lhc%2Fweb%2Fwiklou.git

Per Reedy, follow-up to r77072: don't use array_merge() to add just one item
---

diff --git a/includes/api/ApiQueryLangLinks.php b/includes/api/ApiQueryLangLinks.php
index c2ae0f505b..3f7e4fd777 100644
--- a/includes/api/ApiQueryLangLinks.php
+++ b/includes/api/ApiQueryLangLinks.php
@@ -90,7 +90,7 @@ class ApiQueryLangLinks extends ApiQueryBase {
 			if ( !is_null( $params['url'] ) ) {
 				$title = Title::newFromText( "{$row->ll_lang}:{$row->ll_title}" );
 				if ( $title ) {
-					$entry = array_merge( $entry, array( 'url' => $title->getFullURL() ) );
+					$entry['url'] = $title->getFullURL();
 				}
 			}
 			ApiResult::setContent( $entry, $row->ll_title );