mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
BUGFIX error in RestfulServer: currentMember should be currentUser (fixes #6283)
http://open.silverstripe.org/ticket/6283
This commit is contained in:
parent
6a268a8b37
commit
7b56008414
@ -579,7 +579,7 @@ class RestfulServer extends Controller {
|
|||||||
protected function authenticate() {
|
protected function authenticate() {
|
||||||
if(!isset($_SERVER['PHP_AUTH_USER']) || !isset($_SERVER['PHP_AUTH_PW'])) return false;
|
if(!isset($_SERVER['PHP_AUTH_USER']) || !isset($_SERVER['PHP_AUTH_PW'])) return false;
|
||||||
|
|
||||||
if($member = Member::currentMember()) return $member;
|
if($member = Member::currentUser()) return $member;
|
||||||
$member = MemberAuthenticator::authenticate(array(
|
$member = MemberAuthenticator::authenticate(array(
|
||||||
'Email' => $_SERVER['PHP_AUTH_USER'],
|
'Email' => $_SERVER['PHP_AUTH_USER'],
|
||||||
'Password' => $_SERVER['PHP_AUTH_PW'],
|
'Password' => $_SERVER['PHP_AUTH_PW'],
|
||||||
|
Loading…
Reference in New Issue
Block a user