From 5df5bcba99340ae837ff13a62741eda0e65e2432 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0koda?= Date: Sat, 30 Jun 2012 15:39:12 +0200 Subject: [PATCH] MDL-34036 fix course role user selector --- user/filters/courserole.php | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/user/filters/courserole.php b/user/filters/courserole.php index 49cb54c9508..a38fe415c6f 100644 --- a/user/filters/courserole.php +++ b/user/filters/courserole.php @@ -84,7 +84,7 @@ class user_filter_courserole extends user_filter_type { function get_sql_filter($data) { global $CFG, $DB; static $counter = 0; - $name = 'ex_courserole'.$counter++; + $pref = 'ex_courserole'.($counter++).'_'; $value = $data['value']; $roleid = $data['roleid']; @@ -98,17 +98,16 @@ class user_filter_courserole extends user_filter_type { $where = "b.contextlevel=50"; if ($roleid) { - $where .= " AND a.roleid = :roleid"; - $params['roleid'] = $roleid; - + $where .= " AND a.roleid = :{$pref}roleid"; + $params[$pref.'roleid'] = $roleid; } if ($categoryid) { - $where .= " AND c.category = :categoryid"; - $params['categoryid'] = $categoryid; + $where .= " AND c.category = :{$pref}categoryid"; + $params[$pref.'categoryid'] = $categoryid; } if ($value) { - $where .= " AND c.shortname = :$name"; - $params[$name] = $value; + $where .= " AND c.shortname = :{$pref}course"; + $params[$pref.'course'] = $value; } return array("id IN (SELECT userid FROM {role_assignments} a