Bsitu has uploaded a new change for review.
https://gerrit.wikimedia.org/r/153725
Change subject: use array_merge_resursive when merging based on array keys
......................................................................
use array_merge_resursive when merging based on array keys
Change-Id: I989b9b0994a33925faf52c6d99d8c46920e62cd6
---
M api/ApiEchoNotifications.php
1 file changed, 4 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo
refs/changes/25/153725/1
diff --git a/api/ApiEchoNotifications.php b/api/ApiEchoNotifications.php
index cb77768..6df8ac3 100644
--- a/api/ApiEchoNotifications.php
+++ b/api/ApiEchoNotifications.php
@@ -51,7 +51,10 @@
}
if ( in_array( 'count', $prop ) ) {
- $result += $this->getPropcount( $user,
$params['sections'], $params['groupbysection'] );
+ $result = array_merge_recursive(
+ $result,
+ $this->getPropcount( $user,
$params['sections'], $params['groupbysection'] )
+ );
}
$this->getResult()->setIndexedTagName( $result, 'notification'
);
--
To view, visit https://gerrit.wikimedia.org/r/153725
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I989b9b0994a33925faf52c6d99d8c46920e62cd6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Bsitu <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
