diff options
Diffstat (limited to 'inc')
| -rw-r--r-- | inc/auth.php | 2 | ||||
| -rw-r--r-- | inc/parser/handler.php | 2 |
2 files changed, 2 insertions, 2 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']; } diff --git a/inc/parser/handler.php b/inc/parser/handler.php index 612534eea..4b090b9ef 100644 --- a/inc/parser/handler.php +++ b/inc/parser/handler.php @@ -196,7 +196,7 @@ class Doku_Handler { case DOKU_LEXER_ENTER: $ReWriter = & new Doku_Handler_Nest($this->CallWriter,'footnote_close'); $this->CallWriter = & $ReWriter; - $this->_addCall('footnote_open', array($match), $pos); + $this->_addCall('footnote_open', array(), $pos); break; case DOKU_LEXER_EXIT: $this->_addCall('footnote_close', array(), $pos); |