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 "mw.htmlform: Fields hidden with 'hide-if' should be disabled"
[lhc/web/wiklou.git]
/
includes
/
api
/
ApiComparePages.php
diff --git
a/includes/api/ApiComparePages.php
b/includes/api/ApiComparePages.php
index
ce256a6
..
d6867eb
100644
(file)
--- a/
includes/api/ApiComparePages.php
+++ b/
includes/api/ApiComparePages.php
@@
-34,8
+34,7
@@
class ApiComparePages extends ApiBase {
$revision = Revision::newFromId( $rev1 );
if ( !$revision ) {
$revision = Revision::newFromId( $rev1 );
if ( !$revision ) {
- $this->dieUsage( 'The diff cannot be retrieved, ' .
- 'one revision does not exist or you do not have permission to view it.', 'baddiff' );
+ $this->dieWithError( 'apierror-baddiff' );
}
$contentHandler = $revision->getContentHandler();
}
$contentHandler = $revision->getContentHandler();
@@
-46,7
+45,7
@@
class ApiComparePages extends ApiBase {
true,
false );
true,
false );
- $vals =
array()
;
+ $vals =
[]
;
if ( isset( $params['fromtitle'] ) ) {
$vals['fromtitle'] = $params['fromtitle'];
}
if ( isset( $params['fromtitle'] ) ) {
$vals['fromtitle'] = $params['fromtitle'];
}
@@
-65,14
+64,10
@@
class ApiComparePages extends ApiBase {
$difftext = $de->getDiffBody();
if ( $difftext === false ) {
$difftext = $de->getDiffBody();
if ( $difftext === false ) {
- $this->dieUsage(
- 'The diff cannot be retrieved. Maybe one or both revisions do ' .
- 'not exist or you do not have permission to view them.',
- 'baddiff'
- );
+ $this->dieWithError( 'apierror-baddiff' );
}
}
- ApiResult::setContent
( $vals
, $difftext );
+ ApiResult::setContent
Value( $vals, 'body'
, $difftext );
$this->getResult()->addValue( null, $this->getModuleName(), $vals );
}
$this->getResult()->addValue( null, $this->getModuleName(), $vals );
}
@@
-89,47
+84,44
@@
class ApiComparePages extends ApiBase {
} elseif ( $titleText ) {
$title = Title::newFromText( $titleText );
if ( !$title || $title->isExternal() ) {
} elseif ( $titleText ) {
$title = Title::newFromText( $titleText );
if ( !$title || $title->isExternal() ) {
- $this->die
UsageMsg( array( 'invalidtitle', $titleText )
);
+ $this->die
WithError( [ 'apierror-invalidtitle', wfEscapeWikiText( $titleText ) ]
);
}
return $title->getLatestRevID();
} elseif ( $titleId ) {
$title = Title::newFromID( $titleId );
if ( !$title ) {
}
return $title->getLatestRevID();
} elseif ( $titleId ) {
$title = Title::newFromID( $titleId );
if ( !$title ) {
- $this->die
UsageMsg( array( 'nosuchpageid', $titleId )
);
+ $this->die
WithError( [ 'apierror-nosuchpageid', $titleId ]
);
}
return $title->getLatestRevID();
}
}
return $title->getLatestRevID();
}
- $this->dieUsage(
- 'A title, a page ID, or a revision number is needed for both the from and the to parameters',
- 'inputneeded'
- );
+ $this->dieWithError( 'apierror-compare-inputneeded', 'inputneeded' );
}
public function getAllowedParams() {
}
public function getAllowedParams() {
- return
array(
+ return
[
'fromtitle' => null,
'fromtitle' => null,
- 'fromid' =>
array(
+ 'fromid' =>
[
ApiBase::PARAM_TYPE => 'integer'
ApiBase::PARAM_TYPE => 'integer'
-
)
,
- 'fromrev' =>
array(
+
]
,
+ 'fromrev' =>
[
ApiBase::PARAM_TYPE => 'integer'
ApiBase::PARAM_TYPE => 'integer'
-
)
,
+
]
,
'totitle' => null,
'totitle' => null,
- 'toid' =>
array(
+ 'toid' =>
[
ApiBase::PARAM_TYPE => 'integer'
ApiBase::PARAM_TYPE => 'integer'
-
)
,
- 'torev' =>
array(
+
]
,
+ 'torev' =>
[
ApiBase::PARAM_TYPE => 'integer'
ApiBase::PARAM_TYPE => 'integer'
-
)
,
-
)
;
+
]
,
+
]
;
}
protected function getExamplesMessages() {
}
protected function getExamplesMessages() {
- return
array(
+ return
[
'action=compare&fromrev=1&torev=2'
=> 'apihelp-compare-example-1',
'action=compare&fromrev=1&torev=2'
=> 'apihelp-compare-example-1',
-
)
;
+
]
;
}
}
}
}