L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'wip-MDL-47052-master' of git://github.com/marinaglancy/moodle

Browse Source
This commit is contained in:
Damyon Wiese
2014-09-02 15:30:07 +08:00
parent 8f2e80600b 66aee2c201
commit 5474b8bfbb
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
report/participation/index.php
+1 -2
View File
@@ -208,6 +208,7 @@ if (!empty($instanceid) && !empty($roleid)) {
list($twhere, $tparams) = $table->get_sql_where();
if ($twhere) {
$params = array_merge($params, $tparams);
$matchcount = $DB->count_records_sql($countsql.' AND '.$twhere, $params);
} else {
$matchcount = $totalcount;
@@ -252,7 +253,6 @@ if (!empty($instanceid) && !empty($roleid)) {
" GROUP BY userid) l ON (l.userid = ra.userid)";
if ($twhere) {
$sql .= ' WHERE '.$twhere; // Initial bar.
$params = array_merge($params, $tparams);
}
if ($table->get_sql_sort()) {
@@ -285,7 +285,6 @@ if (!empty($instanceid) && !empty($roleid)) {
if ($twhere) {
$sql .= ' WHERE '.$twhere; // Initial bar.
$params = array_merge($params, $tparams);
}
if ($table->get_sql_sort()) {