From a43f43e2faabe724e7dc65bd88eb15edfd384c49 Mon Sep 17 00:00:00 2001
From: Adrian Greeve <adrian@moodle.com>
Date: Mon, 8 Dec 2014 15:22:50 +0800
Subject: [PATCH] MDL-40097 completion: Update of code to meet guidlines.

---
 backup/moodle2/backup_stepslib.php | 34 ++++++++----------------------
 1 file changed, 9 insertions(+), 25 deletions(-)

diff --git a/backup/moodle2/backup_stepslib.php b/backup/moodle2/backup_stepslib.php
index 85c1e6b35ab..78507d22d99 100644
--- a/backup/moodle2/backup_stepslib.php
+++ b/backup/moodle2/backup_stepslib.php
@@ -2447,31 +2447,15 @@ class backup_course_completion_structure_step extends backup_structure_step {
         $cc->add_child($coursecompletions);
         $cc->add_child($aggregatemethod);
 
-        /*
-         We need some extra data for the restore
-          - courseinstances shortname rather than an ID
-          - roleshortname in case restoring on a different site
-        /
-        $criteria->set_source_sql(
-            "
-                SELECT
-                    ccc.*,
-                    c.shortname AS courseinstanceshortname,
-                    r.shortname AS roleshortname
-                FROM
-                    {course_completion_criteria} ccc
-                LEFT JOIN
-                    {course} c
-                ON c.id = ccc.courseinstance
-                LEFT JOIN
-                    {role} r
-                ON r.id = ccc.role
-                WHERE
-                    ccc.course = ?
-            ",
-             array(backup::VAR_COURSEID)
-        );
-
+        // We need some extra data for the restore.
+        // - courseinstances shortname rather than an ID.
+        // - roleshortname in case restoring on a different site.
+        $sourcesql = "SELECT ccc.*, c.shortname AS courseinstanceshortname, r.shortname AS roleshortname
+                        FROM {course_completion_criteria} ccc
+                   LEFT JOIN {course} c ON c.id = ccc.courseinstance
+                   LEFT JOIN {role} r ON r.id = ccc.role
+                       WHERE ccc.course = ?";
+        $criteria->set_source_sql($sourcesql, array(backup::VAR_COURSEID));
 
         $aggregatemethod->set_source_table('course_completion_aggr_methd', array('course' => backup::VAR_COURSEID));