[MediaWiki-commits] [Gerrit] mediawiki...MsUpload[master]: Remove pre-1.25 API compatibility code

2016-09-20 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Remove pre-1.25 API compatibility code
..


Remove pre-1.25 API compatibility code

Since this extension uses extension.json, it already requires 1.25+ so
no need to keep the old code around.

Change-Id: I903093d439d7d741137839d881ed2124c23d6be3
---
M MsUpload.body.php
1 file changed, 1 insertion(+), 5 deletions(-)

Approvals:
  Jforrester: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/MsUpload.body.php b/MsUpload.body.php
index d67da66..95ae47e 100644
--- a/MsUpload.body.php
+++ b/MsUpload.body.php
@@ -53,11 +53,7 @@
$enableWrite = true;
$api = new ApiMain( $params, $enableWrite );
$api->execute();
-   if ( defined( 'ApiResult::META_CONTENT' ) ) {
-   $data = $api->getResult()->getResultData();
-   } else {
-   $data = &$api->getResultData();
-   }
+   $data = $api->getResult()->getResultData();
return $mediaString;
 
/* The code below does the same and is better,

-- 
To view, visit https://gerrit.wikimedia.org/r/311791
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I903093d439d7d741137839d881ed2124c23d6be3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MsUpload
Gerrit-Branch: master
Gerrit-Owner: Anomie 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...MsUpload[master]: Remove pre-1.25 API compatibility code

2016-09-20 Thread Anomie (Code Review) 
Anomie has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/311791

Change subject: Remove pre-1.25 API compatibility code
..

Remove pre-1.25 API compatibility code

Since this extension uses extension.json, it already requires 1.25+ so
no need to keep the old code around.

Change-Id: I903093d439d7d741137839d881ed2124c23d6be3
---
M MsUpload.body.php
1 file changed, 1 insertion(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MsUpload 
refs/changes/91/311791/1

diff --git a/MsUpload.body.php b/MsUpload.body.php
index d67da66..95ae47e 100644
--- a/MsUpload.body.php
+++ b/MsUpload.body.php
@@ -53,11 +53,7 @@
$enableWrite = true;
$api = new ApiMain( $params, $enableWrite );
$api->execute();
-   if ( defined( 'ApiResult::META_CONTENT' ) ) {
-   $data = $api->getResult()->getResultData();
-   } else {
-   $data = &$api->getResultData();
-   }
+   $data = $api->getResult()->getResultData();
return $mediaString;
 
/* The code below does the same and is better,

-- 
To view, visit https://gerrit.wikimedia.org/r/311791
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I903093d439d7d741137839d881ed2124c23d6be3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MsUpload
Gerrit-Branch: master
Gerrit-Owner: Anomie 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits