[MediaWiki-commits] [Gerrit] Fatal error: Unsupported operand types in Collection.body.php - change (mediawiki...Collection)

[Joerg (Code Review)]

Joerg has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/137917

Change subject: Fatal error: Unsupported operand types in Collection.body.php
......................................................................

Fatal error: Unsupported operand types in Collection.body.php

Bug: 60538
Change-Id: I7c783693a07110d1b94267cbbcfc3822e1609585
(cherry picked from commit 7df4721a7e2f282c14720146042002e271bd9cd8)
---
M Collection.body.php
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Collection 
refs/changes/17/137917/1

diff --git a/Collection.body.php b/Collection.body.php
index 4d8c745..cddfbb1 100644
--- a/Collection.body.php
+++ b/Collection.body.php
@@ -522,6 +522,9 @@
         */
        static function setSettings( array $settings ) {
                $collection = CollectionSession::getCollection();
+               if ( !isset( $collection['settings'] ) ) {
+                       $collection['settings'] = array();
+               }
                $collection['settings'] = $settings + $collection['settings'];
                CollectionSession::setCollection( $collection );
        }

-- 
To view, visit https://gerrit.wikimedia.org/r/137917
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7c783693a07110d1b94267cbbcfc3822e1609585
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Collection
Gerrit-Branch: REL1_23
Gerrit-Owner: Joerg <mueller062001-...@yahoo.de>
Gerrit-Reviewer: Reedy <re...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits