Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

User::isSafeToLoad() should return false if MW_NO_SESSION

Browse source 
Because it's never safe.

Bug: T127233
Change-Id: Ieb5824f1668dc38d1be7c7cbf799da17e581c555
This commit is contained in:
Brad Jorsch 2016-02-23 17:05:15 -05:00
parent adf29385db
commit 8dca366e11
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
includes/user/User.php
View file

@ -315,9 +315,12 @@ class User implements IDBAccessObject {
}
/**
* Test if it's safe to load this User object. You should typically check this before using
* $wgUser or RequestContext::getUser in a method that might be called before the system has
* been fully initialized. If the object is unsafe, you should use an anonymous user:
* Test if it's safe to load this User object.
*
* You should typically check this before using $wgUser or
* RequestContext::getUser in a method that might be called before the
* system has been fully initialized. If the object is unsafe, you should
* use an anonymous user:
* \code
* $user = $wgUser->isSafeToLoad() ? $wgUser : new User;
* \endcode
@ -327,7 +330,14 @@ class User implements IDBAccessObject {
*/
public function isSafeToLoad() {
global $wgFullyInitialised;
return $wgFullyInitialised || $this->mLoadedItems === true || $this->mFrom !== 'session';
// The user is safe to load if:
// * MW_NO_SESSION is undefined AND $wgFullyInitialised is true (safe to use session data)
// * mLoadedItems === true (already loaded)
// * mFrom !== 'session' (sessions not involved at all)
return ( !defined( 'MW_NO_SESSION' ) && $wgFullyInitialised ) ||
$this->mLoadedItems === true || $this->mFrom !== 'session';
}
/**