X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fapi%2FApiFormatFeedWrapper.php;h=d2bfd48d33c7870ab079df4a394c172eb5bbfcfa;hb=7c3e47f5af04c79ce4319d11abd79d6fc352bd8b;hp=3f53ed43d32959b96ba2b8bf639d20712a97201a;hpb=08aaea93e300d3b34befdbd30368c1293973760e;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/api/ApiFormatFeedWrapper.php b/includes/api/ApiFormatFeedWrapper.php
index 3f53ed43d3..d2bfd48d33 100644
--- a/includes/api/ApiFormatFeedWrapper.php
+++ b/includes/api/ApiFormatFeedWrapper.php
@@ -46,8 +46,8 @@ class ApiFormatFeedWrapper extends ApiFormatBase {
 		// Disable size checking for this because we can't continue
 		// cleanly; size checking would cause more problems than it'd
 		// solve
-		$result->addValue( null, '_feed', $feed, ApiResult::NO_SIZE_CHECK );
-		$result->addValue( null, '_feeditems', $feedItems, ApiResult::NO_SIZE_CHECK );
+		$result->addValue( null, '_feed', $feed, ApiResult::NO_VALIDATE );
+		$result->addValue( null, '_feeditems', $feedItems, ApiResult::NO_VALIDATE );
 	}
 
 	/**
@@ -59,15 +59,6 @@ class ApiFormatFeedWrapper extends ApiFormatBase {
 		return null;
 	}
 
-	/**
-	 * Optimization - no need to sanitize data that will not be needed
-	 *
-	 * @return bool
-	 */
-	public function getNeedsRawData() {
-		return true;
-	}
-
 	/**
 	 * ChannelFeed doesn't give us a method to print errors in a friendly
 	 * manner, so just punt errors to the default printer.
@@ -89,7 +80,7 @@ class ApiFormatFeedWrapper extends ApiFormatBase {
 			return;
 		}
 
-		$data = $this->getResultData();
+		$data = $this->getResult()->getResultData();
 		if ( isset( $data['_feed'] ) && isset( $data['_feeditems'] ) ) {
 			$data['_feed']->httpHeaders();
 		} else {
@@ -104,7 +95,7 @@ class ApiFormatFeedWrapper extends ApiFormatBase {
 	 * $result['_feeditems'] - an array of FeedItem instances
 	 */
 	public function execute() {
-		$data = $this->getResultData();
+		$data = $this->getResult()->getResultData();
 		if ( isset( $data['_feed'] ) && isset( $data['_feeditems'] ) ) {
 			$feed = $data['_feed'];
 			$items = $data['_feeditems'];