diff options
| author | Brion Vibber <brion@pobox.com> | 2010-03-29 15:15:51 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-03-29 15:15:51 -0700 |
| commit | 01a03e34c8d286011c0f4301e60c103d992a449a (patch) | |
| tree | d9c5a44704b83d3ca05ed1f136a3748fb8210f12 /lib/apiauth.php | |
| parent | e2d3ebb9f4a3b516067745d250b4723367b928c2 (diff) | |
| parent | cfeb1bfa419e886a1b60dfcbd4260d2f5de0515b (diff) | |
Merge branch '0.9.x' into 1.0.x
Diffstat (limited to 'lib/apiauth.php')
| -rw-r--r-- | lib/apiauth.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/apiauth.php b/lib/apiauth.php index 17f803a1c..e78de618e 100644 --- a/lib/apiauth.php +++ b/lib/apiauth.php @@ -267,7 +267,7 @@ class ApiAuthAction extends ApiAction $this->access = self::READ_WRITE; - if (empty($this->auth_user) && $required) { + if (empty($this->auth_user) && ($required || isset($_SERVER['PHP_AUTH_USER']))) { // basic authentication failed |