Change-Id: Ibcaad4427375b9aa39bb2b333b72a0beb9a3620c
/**
* Get previous revision for this title
*
/**
* Get previous revision for this title
*
- * @return Revision or null
+ * @return Revision|null
*/
public function getPrevious() {
if( $this->getTitle() ) {
*/
public function getPrevious() {
if( $this->getTitle() ) {
* @note This no longer clears uncached lazy-initialised properties;
* the constructor does that instead.
*
* @note This no longer clears uncached lazy-initialised properties;
* the constructor does that instead.
*
+ * @param $name string|bool
*/
public function loadDefaults( $name = false ) {
wfProfileIn( __METHOD__ );
*/
public function loadDefaults( $name = false ) {
wfProfileIn( __METHOD__ );
/**
* Get the user's current token.
/**
* Get the user's current token.
- * @param $forceCreation Force the generation of a new token if the user doesn't have one (default=true for backwards compatibility)
+ * @param $forceCreation bool Force the generation of a new token if the user doesn't have one (default=true for backwards compatibility)
* @return String Token
*/
public function getToken( $forceCreation = true ) {
* @return String Token
*/
public function getToken( $forceCreation = true ) {
*
* @param $request WebRequest object to use; $wgRequest will be used if null
* is passed.
*
* @param $request WebRequest object to use; $wgRequest will be used if null
* is passed.
- * @param $secure Whether to force secure/insecure cookies or use default
+ * @param $secure bool Whether to force secure/insecure cookies or use default
*/
public function setCookies( $request = null, $secure = null ) {
if ( $request === null ) {
*/
public function setCookies( $request = null, $secure = null ) {
if ( $request === null ) {
- if ( 0 == $this->mId ) return;
+ if ( 0 == $this->mId ) {
+ return;
+ }
if ( !$this->mToken ) {
// When token is empty or NULL generate a new one and then save it to the database
// This allows a wiki to re-secure itself after a leak of it's user table or $wgSecretKey
if ( !$this->mToken ) {
// When token is empty or NULL generate a new one and then save it to the database
// This allows a wiki to re-secure itself after a leak of it's user table or $wgSecretKey
/**
* Generate a looking random token for various uses.
*
/**
* Generate a looking random token for various uses.
*
- * @param $salt String Optional salt value
* @return String The new random token
* @deprecated since 1.20; Use MWCryptRand for secure purposes or wfRandomString for pesudo-randomness
*/
* @return String The new random token
* @deprecated since 1.20; Use MWCryptRand for secure purposes or wfRandomString for pesudo-randomness
*/
- public static function generateToken( $salt = '' ) {
+ public static function generateToken() {
return MWCryptRand::generateHex( 32 );
}
return MWCryptRand::generateHex( 32 );
}
/**
* Load the user options either from cache, the database or an array
*
/**
* Load the user options either from cache, the database or an array
*
- * @param $data Rows for the current user out of the user_properties table
+ * @param $data array Rows for the current user out of the user_properties table
*/
protected function loadOptions( $data = null ) {
global $wgContLang;
*/
protected function loadOptions( $data = null ) {
global $wgContLang;