Jdlrobson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/383250 )
Change subject: Deal with cases where contributors and images are not defined
......................................................................
Deal with cases where contributors and images are not defined
Fix test warnings
Tests still fail but it's clearer to why.
Bug: T177801
Change-Id: I24d0146e35c6444fc1ffc3c7f673196964492a33
---
M includes/BookRenderer.php
1 file changed, 10 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Collection
refs/changes/50/383250/1
diff --git a/includes/BookRenderer.php b/includes/BookRenderer.php
index e79cd7a..7ee24a7 100644
--- a/includes/BookRenderer.php
+++ b/includes/BookRenderer.php
@@ -114,9 +114,12 @@
} else {
$metadataLevel = 0;
}
+ $hasImages = isset( $metadata['images'] ) &&
$metadata['images'];
+ $hasLicense = isset( $metadata['license'] ) &&
$metadata['license'];
+
$outline = array_merge( $outline,
$this->getAdditionalBookChapters( $tocHeadingCounter,
$metadataLevel,
- $metadata['images'], $metadata['license'] )
+ $hasImages, $hasLicense )
);
$templateData = [
@@ -127,17 +130,21 @@
'outline' => $outline,
'html' => $bookBodyHtml,
];
- if ( $metadata['images'] ) {
+ if ( $hasImages ) {
$templateData['images'] = [
'data' => $metadata['images'],
'level' =>
$headingCounter->incrementAndGetTopLevel(),
];
+ } else {
+ $templateData['images'] = false;
}
- if ( $metadata['license'] ) {
+ if ( $hasLicense ) {
$templateData['license'] = [
'data' => $metadata['license'],
'level' =>
$headingCounter->incrementAndGetTopLevel(),
];
+ } else {
+ $templateData['license'] = false;
}
return $templateData;
}
--
To view, visit https://gerrit.wikimedia.org/r/383250
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I24d0146e35c6444fc1ffc3c7f673196964492a33
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Collection
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <jrob...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
