Anomie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/183613
Change subject: Update ApiResult handling for mediawiki/core change I7b37295e
......................................................................
Update ApiResult handling for mediawiki/core change I7b37295e
Change I7b37295e for mediawiki/core deprecates several methods, and more
importantly changes the format of the data returned from
ApiResult::getData(). This change should handle these differences in a
backwards-compatible manner.
Change-Id: I7b37295e8862b188d1f3b0cd07f66ac34629678d
---
M ApiQueryTemplateInfo.php
1 file changed, 8 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TemplateInfo
refs/changes/13/183613/1
diff --git a/ApiQueryTemplateInfo.php b/ApiQueryTemplateInfo.php
index 069bfbb..2edaf50 100644
--- a/ApiQueryTemplateInfo.php
+++ b/ApiQueryTemplateInfo.php
@@ -47,11 +47,16 @@
// message by checking whether the first character
// is '<' - this is an interim solution until there's
// a better storage format in place
- if (substr($template_info, 0, 1) == '<')
- ApiResult::setContent( $vals, $row->pp_value );
- else
+ if (substr($template_info, 0, 1) == '<') {
+ if ( defined( 'ApiResult::META_CONTENT' ) ) {
+ ApiResult::setContentValue( $vals,
'value', $row->pp_value );
+ } else {
+ ApiResult::setContent( $vals,
$row->pp_value );
+ }
+ } else {
// add error message as an "error=" attribute
$vals['error'] = $row->pp_value;
+ }
$fit = $this->addPageSubItems( $row->pp_page, $vals );
if( !$fit ) {
$this->setContinueEnumParameter( 'continue',
$row->pp_page );
--
To view, visit https://gerrit.wikimedia.org/r/183613
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7b37295e8862b188d1f3b0cd07f66ac34629678d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TemplateInfo
Gerrit-Branch: master
Gerrit-Owner: Anomie <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
