summaryrefslogtreecommitdiff
path: root/functions.php
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2008-08-01 04:47:16 +0100
committerAndrew Dolgov <[email protected]>2008-08-01 04:47:16 +0100
commit73f5f114ec76d32db19f3dcc2aa571c912ed360b (patch)
treefd382dfdfa29c9a38973cf68e401b3102d76afa2 /functions.php
parent8dccabedaee3450642c58c75101ff52c38508112 (diff)
merge tweaks to ALLOW_REMOTE_USER_AUTH functionality from Erick Rudiak
Diffstat (limited to 'functions.php')
-rw-r--r--functions.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/functions.php b/functions.php
index e00faf6b6..f1836edd8 100644
--- a/functions.php
+++ b/functions.php
@@ -1682,11 +1682,11 @@
$pwd_hash2 = encrypt_password($password, $login);
if (defined('ALLOW_REMOTE_USER_AUTH') && ALLOW_REMOTE_USER_AUTH
- && $_SERVER["REMOTE_USER"]) {
+ && $_SERVER["REMOTE_USER"] && $login != "admin") {
$login = db_escape_string($_SERVER["REMOTE_USER"]);
- $query = "SELECT id,login,access_level
+ $query = "SELECT id,login,access_level,pwd_hash
FROM ttrss_users WHERE
login = '$login'";