jenkins-bot has submitted this change and it was merged.
Change subject: Add isset checks for array in CollectionsList
......................................................................
Add isset checks for array in CollectionsList
Set $public as a boolean variable, which is
what CollectionInfo / CollectionBase expects.
Bug: T96585
Change-Id: I86cbd9a0456d67990682ad2f65c0aba2fb5bf822
---
M includes/models/CollectionsList.php
1 file changed, 5 insertions(+), 3 deletions(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/models/CollectionsList.php
b/includes/models/CollectionsList.php
index 386213d..6f9f9a1 100644
--- a/includes/models/CollectionsList.php
+++ b/includes/models/CollectionsList.php
@@ -149,10 +149,12 @@
if ( isset( $data['query']['lists'] ) ) {
$lists = $data['query']['lists'];
foreach ( $lists as $list ) {
- if ( $list['public'] || $includePrivate ) {
- $image = $list['image'] ? wfFindFile(
$list['image'] ) : false;
+ $public = $list['perm'] === 'public';
+
+ if ( $public || $includePrivate ) {
+ $image = isset( $list['image'] ) ?
wfFindFile( $list['image'] ) : false;
$info = new models\CollectionInfo(
$list['id'], $user,
- $list['label'],
$list['description'], $list['public'], $image );
+ $list['label'],
$list['description'], $public, $image );
$info->setCount( $list['count'] );
if ( $list['perm'] === 'hidden' ) {
$info->setHidden();
--
To view, visit https://gerrit.wikimedia.org/r/205297
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I86cbd9a0456d67990682ad2f65c0aba2fb5bf822
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/Gather
Gerrit-Branch: master
Gerrit-Owner: Aude <[email protected]>
Gerrit-Reviewer: Aude <[email protected]>
Gerrit-Reviewer: Florianschmidtwelzow <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
