Anomie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/183591
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: I7b37295e8862b188d1f3b0cd07f66ac34629678e
---
M api/ApiListNovaInstances.php
M api/ApiListNovaProjects.php
2 files changed, 10 insertions(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OpenStackManager
refs/changes/91/183591/1
diff --git a/api/ApiListNovaInstances.php b/api/ApiListNovaInstances.php
index 18fae64..0218ca2 100644
--- a/api/ApiListNovaInstances.php
+++ b/api/ApiListNovaInstances.php
@@ -63,7 +63,11 @@
$this->getResult()->addValue( array( 'query',
$this->getModuleName() ), null, $info );
}
- $this->getResult()->setIndexedTagName_internal( array( 'query',
$this->getModuleName() ), 'instance' );
+ if ( defined( 'ApiResult::META_CONTENT' ) ) {
+ $this->getResult()->defineIndexedTagName( array(
'query', $this->getModuleName() ), 'instance' );
+ } else {
+ $this->getResult()->setIndexedTagName_internal( array(
'query', $this->getModuleName() ), 'instance' );
+ }
}
/**
diff --git a/api/ApiListNovaProjects.php b/api/ApiListNovaProjects.php
index 11f7aab..5760891 100644
--- a/api/ApiListNovaProjects.php
+++ b/api/ApiListNovaProjects.php
@@ -24,7 +24,11 @@
);
}
- $this->getResult()->setIndexedTagName_internal( array( 'query',
$this->getModuleName() ), 'project' );
+ if ( defined( 'ApiResult::META_CONTENT' ) ) {
+ $this->getResult()->defineIndexedTagName( array(
'query', $this->getModuleName() ), 'project' );
+ } else {
+ $this->getResult()->setIndexedTagName_internal( array(
'query', $this->getModuleName() ), 'project' );
+ }
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/183591
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7b37295e8862b188d1f3b0cd07f66ac34629678e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OpenStackManager
Gerrit-Branch: master
Gerrit-Owner: Anomie <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
