From dee461221e35d77123b20f494c52f5dc06bffd7c Mon Sep 17 00:00:00 2001 From: Michael de Raadt Date: Sat, 2 Sep 2017 17:54:30 +1000 Subject: [PATCH] CONTRIB-6608 block_completion_progress: Oracle and MySQL concat issue --- lib.php | 4 ++-- version.php | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib.php b/lib.php index a27dbd7..443283b 100644 --- a/lib.php +++ b/lib.php @@ -96,7 +96,7 @@ function block_completion_progress_course_submissions($courseid) { // Queries to deliver instance IDs of activities with submissions by user. $queries = array ( - 'assign' => "SELECT CONCAT(s.userid, '-', c.id) + 'assign' => "SELECT ". $DB->sql_concat('s.userid', ''-'', 'c.id') ." FROM {assign_submission} s, {assign} a, {modules} m, {course_modules} c WHERE s.latest = 1 AND s.status = 'submitted' @@ -105,7 +105,7 @@ function block_completion_progress_course_submissions($courseid) { AND m.name = 'assign' AND m.id = c.module AND c.instance = a.id", - 'workshop' => "SELECT CONCAT(s.authorid, '-', c.id) + 'workshop' => "SELECT ". $DB->sql_concat('s.userid', ''-'', 'c.id') ." FROM {workshop_submissions} s, {workshop} w, {modules} m, {course_modules} c WHERE s.workshopid = w.id AND w.course = :courseid diff --git a/version.php b/version.php index fb7df92..9416bca 100644 --- a/version.php +++ b/version.php @@ -25,8 +25,8 @@ defined('MOODLE_INTERNAL') || die; -$plugin->version = 2016090500; -$plugin->requires = 2014051200; // Moodle 2.7. +$plugin->version = 2017090100; +$plugin->requires = 2014111100; // Moodle 2.8. $plugin->maturity = MATURITY_STABLE; -$plugin->release = 'Version for Moodle 2.7 onwards'; +$plugin->release = 'Version for Moodle 2.8 onwards'; $plugin->component = 'block_completion_progress';