dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Make api nearmatch search work same as 'go' feature"
[lhc/web/wiklou.git]
/
includes
/
api
/
ApiImageRotate.php
diff --git
a/includes/api/ApiImageRotate.php
b/includes/api/ApiImageRotate.php
index
6fd79f4
..
865d39f
100644
(file)
--- a/
includes/api/ApiImageRotate.php
+++ b/
includes/api/ApiImageRotate.php
@@
-42,7
+42,7
@@
class ApiImageRotate extends ApiBase {
$v = $val;
}
if ( $flag !== null ) {
$v = $val;
}
if ( $flag !== null ) {
- $v[$flag] =
''
;
+ $v[$flag] =
true
;
}
$result[] = $v;
}
}
$result[] = $v;
}
@@
-52,7
+52,8
@@
class ApiImageRotate extends ApiBase {
$params = $this->extractRequestParams();
$rotation = $params['rotation'];
$params = $this->extractRequestParams();
$rotation = $params['rotation'];
- $this->getResult()->beginContinuation( $params['continue'], array(), array() );
+ $continuationManager = new ApiContinuationManager( $this, array(), array() );
+ $this->setContinuationManager( $continuationManager );
$pageSet = $this->getPageSet();
$pageSet->execute();
$pageSet = $this->getPageSet();
$pageSet->execute();
@@
-70,7
+71,7
@@
class ApiImageRotate extends ApiBase {
$r['id'] = $title->getArticleID();
ApiQueryBase::addTitleInfo( $r, $title );
if ( !$title->exists() ) {
$r['id'] = $title->getArticleID();
ApiQueryBase::addTitleInfo( $r, $title );
if ( !$title->exists() ) {
- $r['missing'] =
''
;
+ $r['missing'] =
true
;
}
$file = wfFindFile( $title, array( 'latest' => true ) );
}
$file = wfFindFile( $title, array( 'latest' => true ) );
@@
-122,7
+123,7
@@
class ApiImageRotate extends ApiBase {
$r['result'] = 'Success';
} else {
$r['result'] = 'Failure';
$r['result'] = 'Success';
} else {
$r['result'] = 'Failure';
- $r['errormessage'] = $this->get
Result()->convertStatusToArray
( $status );
+ $r['errormessage'] = $this->get
ErrorFormatter()->arrayFromStatus
( $status );
}
} else {
$r['result'] = 'Failure';
}
} else {
$r['result'] = 'Failure';
@@
-131,9
+132,11
@@
class ApiImageRotate extends ApiBase {
$result[] = $r;
}
$apiResult = $this->getResult();
$result[] = $r;
}
$apiResult = $this->getResult();
-
$apiResult->
setIndexedTagName( $result, 'page' );
+
ApiResult::
setIndexedTagName( $result, 'page' );
$apiResult->addValue( null, $this->getModuleName(), $result );
$apiResult->addValue( null, $this->getModuleName(), $result );
- $apiResult->endContinuation();
+
+ $this->setContinuationManager( null );
+ $continuationManager->setContinuationIntoResult( $apiResult );
}
/**
}
/**