summaryrefslogtreecommitdiff
path: root/inc/auth.php
diff options
context:
space:
mode:
authorchris <chris@jalakai.co.uk>2006-08-05 10:24:42 +0200
committerchris <chris@jalakai.co.uk>2006-08-05 10:24:42 +0200
commit4a26ad858528ca19c411f390a63b247673ba79fb (patch)
tree5c1d69139dae2c35ae654777c03b0519b1b05190 /inc/auth.php
parent5587e44c45f200479ef9ab3bd8f0264647941483 (diff)
downloadrpg-4a26ad858528ca19c411f390a63b247673ba79fb.tar.gz
rpg-4a26ad858528ca19c411f390a63b247673ba79fb.tar.bz2
more unittest updates
darcs-hash:20060805082442-9b6ab-8447755da8c66c5cfc3ee0df0f8bb97375a2a1ff.gz
Diffstat (limited to 'inc/auth.php')
-rw-r--r--inc/auth.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/inc/auth.php b/inc/auth.php
index 8043feb45..ed32dc95d 100644
--- a/inc/auth.php
+++ b/inc/auth.php
@@ -56,7 +56,7 @@
// do the login either by cookie or provided credentials
if($conf['useacl']){
// if no credentials were given try to use HTTP auth (for SSO)
- if(empty($_REQUEST['u']) && !$_COOKIE[DOKU_COOKIE] && $_SERVER['PHP_AUTH_USER']){
+ if(empty($_REQUEST['u']) && empty($_COOKIE[DOKU_COOKIE]) && !empty($_SERVER['PHP_AUTH_USER'])){
$_REQUEST['u'] = $_SERVER['PHP_AUTH_USER'];
$_REQUEST['p'] = $_SERVER['PHP_AUTH_PW'];
}