X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fapi%2FApiQueryDeletedrevs.php;h=76f594e277cbeea517de2c9464eb1bc448325e25;hb=c656c3d7d4c34dfb8832c632df2daa9867bd90a2;hp=f46fb34f5a30446a10387921e672d9f00f84d98d;hpb=badc035712ded02e8ec7ee4c5e8a0fe09e2811d2;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/api/ApiQueryDeletedrevs.php b/includes/api/ApiQueryDeletedrevs.php
index f46fb34f5a..76f594e277 100644
--- a/includes/api/ApiQueryDeletedrevs.php
+++ b/includes/api/ApiQueryDeletedrevs.php
@@ -177,7 +177,7 @@ class ApiQueryDeletedrevs extends ApiQueryBase {
 
 		if ( $limit == 'max' ) {
 			$limit = $this->getMain()->canApiHighLimits() ? $botMax : $userMax;
-			$this->getResult()->setParsedLimit( $this->getModuleName(), $limit );
+			$this->getResult()->addParsedLimit( $this->getModuleName(), $limit );
 		}
 
 		$this->validateLimit( 'limit', $limit, 1, $userMax, $botMax );
@@ -320,7 +320,7 @@ class ApiQueryDeletedrevs extends ApiQueryBase {
 			}
 			if ( $fld_user || $fld_userid ) {
 				if ( $row->ar_deleted & Revision::DELETED_USER ) {
-					$rev['userhidden'] = '';
+					$rev['userhidden'] = true;
 					$anyHidden = true;
 				}
 				if ( Revision::userCanBitfield( $row->ar_deleted, Revision::DELETED_USER, $user ) ) {
@@ -328,14 +328,14 @@ class ApiQueryDeletedrevs extends ApiQueryBase {
 						$rev['user'] = $row->ar_user_text;
 					}
 					if ( $fld_userid ) {
-						$rev['userid'] = $row->ar_user;
+						$rev['userid'] = (int)$row->ar_user;
 					}
 				}
 			}
 
 			if ( $fld_comment || $fld_parsedcomment ) {
 				if ( $row->ar_deleted & Revision::DELETED_COMMENT ) {
-					$rev['commenthidden'] = '';
+					$rev['commenthidden'] = true;
 					$anyHidden = true;
 				}
 				if ( Revision::userCanBitfield( $row->ar_deleted, Revision::DELETED_COMMENT, $user ) ) {
@@ -349,15 +349,15 @@ class ApiQueryDeletedrevs extends ApiQueryBase {
 				}
 			}
 
-			if ( $fld_minor && $row->ar_minor_edit == 1 ) {
-				$rev['minor'] = '';
+			if ( $fld_minor ) {
+				$rev['minor'] = $row->ar_minor_edit == 1;
 			}
 			if ( $fld_len ) {
 				$rev['len'] = $row->ar_len;
 			}
 			if ( $fld_sha1 ) {
 				if ( $row->ar_deleted & Revision::DELETED_TEXT ) {
-					$rev['sha1hidden'] = '';
+					$rev['sha1hidden'] = true;
 					$anyHidden = true;
 				}
 				if ( Revision::userCanBitfield( $row->ar_deleted, Revision::DELETED_TEXT, $user ) ) {
@@ -370,15 +370,15 @@ class ApiQueryDeletedrevs extends ApiQueryBase {
 			}
 			if ( $fld_content ) {
 				if ( $row->ar_deleted & Revision::DELETED_TEXT ) {
-					$rev['texthidden'] = '';
+					$rev['texthidden'] = true;
 					$anyHidden = true;
 				}
 				if ( Revision::userCanBitfield( $row->ar_deleted, Revision::DELETED_TEXT, $user ) ) {
 					if ( isset( $row->ar_text ) && !$row->ar_text_id ) {
 						// Pre-1.5 ar_text row (if condition from Revision::newFromArchiveRow)
-						ApiResult::setContent( $rev, Revision::getRevisionText( $row, 'ar_' ) );
+						ApiResult::setContentValue( $rev, 'text', Revision::getRevisionText( $row, 'ar_' ) );
 					} else {
-						ApiResult::setContent( $rev, Revision::getRevisionText( $row ) );
+						ApiResult::setContentValue( $rev, 'text', Revision::getRevisionText( $row ) );
 					}
 				}
 			}
@@ -386,7 +386,7 @@ class ApiQueryDeletedrevs extends ApiQueryBase {
 			if ( $fld_tags ) {
 				if ( $row->ts_tags ) {
 					$tags = explode( ',', $row->ts_tags );
-					$this->getResult()->setIndexedTagName( $tags, 'tag' );
+					ApiResult::setIndexedTagName( $tags, 'tag' );
 					$rev['tags'] = $tags;
 				} else {
 					$rev['tags'] = array();
@@ -394,14 +394,14 @@ class ApiQueryDeletedrevs extends ApiQueryBase {
 			}
 
 			if ( $anyHidden && ( $row->ar_deleted & Revision::DELETED_RESTRICTED ) ) {
-				$rev['suppressed'] = '';
+				$rev['suppressed'] = true;
 			}
 
 			if ( !isset( $pageMap[$row->ar_namespace][$row->ar_title] ) ) {
 				$pageID = $newPageID++;
 				$pageMap[$row->ar_namespace][$row->ar_title] = $pageID;
 				$a['revisions'] = array( $rev );
-				$result->setIndexedTagName( $a['revisions'], 'rev' );
+				ApiResult::setIndexedTagName( $a['revisions'], 'rev' );
 				$title = Title::makeTitle( $row->ar_namespace, $row->ar_title );
 				ApiQueryBase::addTitleInfo( $a, $title );
 				if ( $fld_token ) {
@@ -425,7 +425,7 @@ class ApiQueryDeletedrevs extends ApiQueryBase {
 				break;
 			}
 		}
-		$result->setIndexedTagName_internal( array( 'query', $this->getModuleName() ), 'page' );
+		$result->addIndexedTagName( array( 'query', $this->getModuleName() ), 'page' );
 	}
 
 	public function isDeprecated() {