diff options
| author | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-05-14 16:27:08 +0000 |
|---|---|---|
| committer | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-05-14 16:27:08 +0000 |
| commit | 6ba1737c22a002a71210fcd15ad36c3c2bc68402 (patch) | |
| tree | 22e44b38f986ac94ecb7d831d043d87ac687bf27 /engine/lib/api.php | |
| parent | 368c947601348a68dd6805658e637a1e634779e5 (diff) | |
| download | elgg-6ba1737c22a002a71210fcd15ad36c3c2bc68402.tar.gz elgg-6ba1737c22a002a71210fcd15ad36c3c2bc68402.tar.bz2 | |
merge -r5832:5898 from 1.7 to trunk.
git-svn-id: http://code.elgg.org/elgg/trunk@6055 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine/lib/api.php')
| -rw-r--r-- | engine/lib/api.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/engine/lib/api.php b/engine/lib/api.php index 6b773138e..6707a7418 100644 --- a/engine/lib/api.php +++ b/engine/lib/api.php @@ -423,9 +423,11 @@ function authenticate_method($method) { } } - // check user authentication if required + $user_auth_result = pam_authenticate(); + + // check if user authentication is required if ($API_METHODS[$method]["require_user_auth"] == true) { - if (pam_authenticate() == false) { + if ($user_auth_result == false) { throw new APIException(elgg_echo('APIException:UserAuthenticationFailed')); } } |