diff options
Diffstat (limited to 'inc/auth.php')
| -rw-r--r-- | inc/auth.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/inc/auth.php b/inc/auth.php index 1eef0db91..0d267cb27 100644 --- a/inc/auth.php +++ b/inc/auth.php @@ -59,6 +59,7 @@ if (!isset($_REQUEST['p'])) $_REQUEST['p'] = ''; if (!isset($_REQUEST['r'])) $_REQUEST['r'] = ''; $_REQUEST['http_credentials'] = false; + if (!$conf['rememberme']) $_REQUEST['r'] = false; // if no credentials were given try to use HTTP auth (for SSO) if(empty($_REQUEST['u']) && empty($_COOKIE[DOKU_COOKIE]) && !empty($_SERVER['PHP_AUTH_USER'])){ |