Commit 59b1a87bf1681405977bb1cf273b893fdff0cd30
1 parent
b93276a689
Exists in
master
[fix] Apply #4574 fix manually
Showing 1 changed file with 6 additions and 4 deletions Side-by-side Diff
sources/lib/base.php
| ... | ... | @@ -969,10 +969,12 @@ class OC { |
| 969 | 969 | return false; |
| 970 | 970 | } |
| 971 | 971 | |
| 972 | - if (OC_User::login($_SERVER["PHP_AUTH_USER"], $_SERVER["PHP_AUTH_PW"])) { | |
| 973 | - //OC_Log::write('core',"Logged in with HTTP Authentication", OC_Log::DEBUG); | |
| 974 | - OC_User::unsetMagicInCookie(); | |
| 975 | - $_SERVER['HTTP_REQUESTTOKEN'] = OC_Util::callRegister(); | |
| 972 | + if (!OC_User::isLoggedIn()) { | |
| 973 | + if (OC_User::login($_SERVER["PHP_AUTH_USER"], $_SERVER["PHP_AUTH_PW"])) { | |
| 974 | + //OC_Log::write('core',"Logged in with HTTP Authentication", OC_Log::DEBUG); | |
| 975 | + OC_User::unsetMagicInCookie(); | |
| 976 | + $_SERVER['HTTP_REQUESTTOKEN'] = OC_Util::callRegister(); | |
| 977 | + } | |
| 976 | 978 | } |
| 977 | 979 | return true; |
| 978 | 980 | } |