Yaron Koren has submitted this change and it was merged.
Change subject: Added handling for new CargoFieldDescription::getDelimiter()
......................................................................
Added handling for new CargoFieldDescription::getDelimiter()
Change-Id: I6d751282c2edd028a89b86a226a8f539ce539bea
---
M includes/SF_TemplateField.php
1 file changed, 6 insertions(+), 1 deletion(-)
Approvals:
Yaron Koren: Checked; Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/SF_TemplateField.php b/includes/SF_TemplateField.php
index 2e660fb..954d86a 100644
--- a/includes/SF_TemplateField.php
+++ b/includes/SF_TemplateField.php
@@ -157,7 +157,12 @@
$this->mFieldType = $fieldDescription->mType;
}
$this->mIsList = $fieldDescription->mIsList;
- $this->mDelimiter = $fieldDescription->mDelimiter;
+ if ( method_exists( $fieldDescription, 'getDelimiter' ) ) {
+ // Cargo 0.11+
+ $this->mDelimiter = $fieldDescription->getDelimiter();
+ } else {
+ $this->mDelimiter = $fieldDescription->mDelimiter;
+ }
$this->mPossibleValues = $fieldDescription->mAllowedValues;
}
--
To view, visit https://gerrit.wikimedia.org/r/260718
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6d751282c2edd028a89b86a226a8f539ce539bea
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticForms
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren <[email protected]>
Gerrit-Reviewer: Yaron Koren <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
