From: Jeroen De Dauw Date: Tue, 6 Sep 2011 20:31:51 +0000 (+0000) Subject: doc fix X-Git-Tag: 1.31.0-rc.0~27864 X-Git-Url: http://git.cyclocoop.org/%22.%24h.%22?a=commitdiff_plain;h=328765afbc54b20feb302cd82c66150e80393f71;p=lhc%2Fweb%2Fwiklou.git doc fix --- diff --git a/includes/api/ApiBase.php b/includes/api/ApiBase.php index 5c21f83548..ad157238d7 100644 --- a/includes/api/ApiBase.php +++ b/includes/api/ApiBase.php @@ -1282,7 +1282,7 @@ abstract class ApiBase { /** * Returns the token salt if there is one, '' if the module doesn't require a salt, else false if the module doesn't need a token - * @return bool + * @return bool|string */ public function getTokenSalt() { return false; diff --git a/includes/api/ApiResult.php b/includes/api/ApiResult.php index a8ca6046ea..b644354f72 100644 --- a/includes/api/ApiResult.php +++ b/includes/api/ApiResult.php @@ -259,6 +259,7 @@ class ApiResult extends ApiBase { */ public function addValue( $path, $name, $value, $overwrite = false ) { global $wgAPIMaxResultSize; + $data = &$this->mData; if ( $this->mCheckingSize ) { $newsize = $this->mSize + self::size( $value );