Gilles has uploaded a new change for review. https://gerrit.wikimedia.org/r/165476
Change subject: Fix PHP notices complaining about missing array indices ...................................................................... Fix PHP notices complaining about missing array indices Bug: 71793 Change-Id: Iaa1b01d9a1d4adde637676226c42f1471112db79 --- M DataCollector.php 1 file changed, 12 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CommonsMetadata refs/changes/76/165476/1 diff --git a/DataCollector.php b/DataCollector.php index b8d7e0d..018954b 100755 --- a/DataCollector.php +++ b/DataCollector.php @@ -157,9 +157,18 @@ protected function getTemplateMetadata( $templateData ) { // GetExtendedMetadata does not handle multivalued fields, we need to select one of everything $templateFields = array(); - $templateFields = array_merge( $templateFields, $this->selectCoordinate( $templateData[TemplateParser::COORDINATES_KEY] ) ); - $templateFields = array_merge( $templateFields, $this->selectInformationTemplate( $templateData[TemplateParser::INFORMATION_FIELDS_KEY] ) ); - $templateFields = array_merge( $templateFields, $this->selectLicense( $templateData[TemplateParser::LICENSES_KEY] ) ); + + if ( isset( $templateData[TemplateParser::COORDINATES_KEY] ) ) { + $templateFields = array_merge( $templateFields, $this->selectCoordinate( $templateData[TemplateParser::COORDINATES_KEY] ) ); + } + + if ( isset( $templateData[TemplateParser::INFORMATION_FIELDS_KEY] ) ) { + $templateFields = array_merge( $templateFields, $this->selectInformationTemplate( $templateData[TemplateParser::INFORMATION_FIELDS_KEY] ) ); + } + + if ( isset( $templateData[TemplateParser::LICENSES_KEY] ) ) { + $templateFields = array_merge( $templateFields, $this->selectLicense( $templateData[TemplateParser::LICENSES_KEY] ) ); + } $metadata = array(); foreach( $templateFields as $name => $value ) { -- To view, visit https://gerrit.wikimedia.org/r/165476 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iaa1b01d9a1d4adde637676226c42f1471112db79 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CommonsMetadata Gerrit-Branch: master Gerrit-Owner: Gilles <gdu...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits