summaryrefslogtreecommitdiffstats
path: root/extra/svn
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2009-05-12 16:56:23 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2009-05-12 16:56:23 +0000
commitbae7579a7222260ecec76084ddd1ba01ff2abe80 (patch)
tree5c09f8786adfebbf4d798f5c720a9bd9f6228f57 /extra/svn
parentc6efc90041878f1dd2458d6977e8f72e020f9907 (diff)
downloadredmine-bae7579a7222260ecec76084ddd1ba01ff2abe80.tar.gz
redmine-bae7579a7222260ecec76084ddd1ba01ff2abe80.zip
Fixes Redmine.pm broken by r2726 (#3330).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2732 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'extra/svn')
-rw-r--r--extra/svn/Redmine.pm8
1 files changed, 5 insertions, 3 deletions
diff --git a/extra/svn/Redmine.pm b/extra/svn/Redmine.pm
index a15b482e8..20f795779 100644
--- a/extra/svn/Redmine.pm
+++ b/extra/svn/Redmine.pm
@@ -149,16 +149,18 @@ sub RedmineDSN {
$self->{RedmineDSN} = $arg;
my $query = "SELECT
hashed_password, auth_source_id, permissions
- FROM members, projects, users, roles
+ FROM members, projects, users, roles, member_roles
WHERE
- projects.id=members.project_id
+ projects.id=members.project_id
+ AND member_roles.member_id=members.id
AND users.id=members.user_id
- AND roles.id=members.role_id
+ AND roles.id=member_roles.role_id
AND users.status=1
AND login=?
AND identifier=? ";
$self->{RedmineQuery} = trim($query);
}
+
sub RedmineDbUser { set_val('RedmineDbUser', @_); }
sub RedmineDbPass { set_val('RedmineDbPass', @_); }
sub RedmineDbWhereClause {