Skip to content

Commit

Permalink
Merge branch 'MDL-45171' of git://github.com/stronk7/moodle
Browse files Browse the repository at this point in the history
  • Loading branch information
danpoltawski committed Apr 21, 2014
2 parents c8ca0ce + 6b139ed commit 085c68d
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions report/log/classes/table_log.php
Original file line number Diff line number Diff line change
Expand Up @@ -481,7 +481,7 @@ public function update_users_and_courses_used() {
$ccselect = ', ' . context_helper::get_preload_record_columns_sql('ctx');
$ccjoin = "LEFT JOIN {context} ctx ON (ctx.instanceid = c.id AND ctx.contextlevel = :contextlevel)";
$courseparams['contextlevel'] = CONTEXT_COURSE;
$sql = "SELECT c.id,c.shortname $ccselect FROM {course} as c
$sql = "SELECT c.id,c.shortname $ccselect FROM {course} c
$ccjoin
WHERE c.id " . $coursesql;

Expand All @@ -496,4 +496,4 @@ public function update_users_and_courses_used() {
}
}
}
}
}
2 changes: 1 addition & 1 deletion report/loglive/classes/table_log.php
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@ public function update_users_and_courses_used() {
$ccselect = ', ' . context_helper::get_preload_record_columns_sql('ctx');
$ccjoin = "LEFT JOIN {context} ctx ON (ctx.instanceid = c.id AND ctx.contextlevel = :contextlevel)";
$courseparams['contextlevel'] = CONTEXT_COURSE;
$sql = "SELECT c.id,c.shortname $ccselect FROM {course} as c
$sql = "SELECT c.id,c.shortname $ccselect FROM {course} c
$ccjoin
WHERE c.id " . $coursesql;

Expand Down

0 comments on commit 085c68d

Please sign in to comment.