Commit d12b6cc8 authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review
Browse files

Merge "Checking the remoteusername for parent auth better (Bug #1364170)" into 1.9_STABLE

parents 7d793f27 9623f879
...@@ -186,7 +186,7 @@ class User { ...@@ -186,7 +186,7 @@ class User {
( (
LOWER(username) = ( LOWER(username) = (
SELECT SELECT
username LOWER(username)
FROM FROM
{usr} us {usr} us
JOIN JOIN
...@@ -195,8 +195,7 @@ class User { ...@@ -195,8 +195,7 @@ class User {
LOWER(aru.remoteusername) = ' . db_quote($username) . ' LOWER(aru.remoteusername) = ' . db_quote($username) . '
AND us.authinstance = ' . db_quote($parentid) . ' AND us.authinstance = ' . db_quote($parentid) . '
) )
AND AND u.authinstance = ' . db_quote($parentid) . '
u.authinstance = ' . db_quote($parentid) . '
) )
'; ';
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment