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 "Unsetting the email address for a user when the email address is invalidated."
[lhc/web/wiklou.git]
/
includes
/
api
/
ApiFormatJson.php
diff --git
a/includes/api/ApiFormatJson.php
b/includes/api/ApiFormatJson.php
index
15dc73b
..
e2c6b9a
100644
(file)
--- a/
includes/api/ApiFormatJson.php
+++ b/
includes/api/ApiFormatJson.php
@@
-32,7
+32,7
@@
class ApiFormatJson extends ApiFormatBase {
private $mIsRaw;
private $mIsRaw;
- public function __construct( $main, $format ) {
+ public function __construct(
ApiMain
$main, $format ) {
parent::__construct( $main, $format );
$this->mIsRaw = ( $format === 'rawfm' );
}
parent::__construct( $main, $format );
$this->mIsRaw = ( $format === 'rawfm' );
}
@@
-91,8
+91,8
@@
class ApiFormatJson extends ApiFormatBase {
public function getDescription() {
if ( $this->mIsRaw ) {
return 'Output data with the debugging elements in JSON format' . parent::getDescription();
public function getDescription() {
if ( $this->mIsRaw ) {
return 'Output data with the debugging elements in JSON format' . parent::getDescription();
- } else {
- return 'Output data in JSON format' . parent::getDescription();
}
}
+
+ return 'Output data in JSON format' . parent::getDescription();
}
}
}
}