From 5d81b754bec4335d00a815d0eae55a052c31e520 Mon Sep 17 00:00:00 2001
From: Damyon Wiese <damyon.wiese@netspot.com.au>
Date: Fri, 4 May 2012 15:35:51 +0800
Subject: [PATCH] MDL-32780: Use Moodle functions for building SQL in
 assignment upgrade tool

Fixed functions:
tool_assignmentupgrade_load_all_upgradable_assignmentids() and
tool_assignmentupgrade_any_upgradable_assignments()
---
 admin/tool/assignmentupgrade/locallib.php | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/admin/tool/assignmentupgrade/locallib.php b/admin/tool/assignmentupgrade/locallib.php
index 89e0e244d7e..5b814859fc3 100644
--- a/admin/tool/assignmentupgrade/locallib.php
+++ b/admin/tool/assignmentupgrade/locallib.php
@@ -131,16 +131,11 @@ function tool_assignmentupgrade_any_upgradable_assignments() {
             $upgradabletypes[] = $shorttype;
         }
     }
-    $paramlist = '?';
-    foreach ($upgradabletypes as $index => $upgradabletype) {
-        if ($index > 0) {
-            $paramlist .= ', ?';
-        }
-    }
+    list($sql, $params) = $DB->get_in_or_equal($upgradabletypes);
 
-    $record = $DB->get_record_sql('SELECT COUNT(id) as count from {assignment} where assignmenttype in (' . $paramlist . ')', $upgradabletypes);
+    $count = $DB->count_records_sql('SELECT COUNT(id) from {assignment} where assignmenttype ' . $sql, $params);
 
-    return $record->count > 0;
+    return $count > 0;
 }
 
 /**
@@ -161,14 +156,10 @@ function tool_assignmentupgrade_load_all_upgradable_assignmentids() {
             $upgradabletypes[] = $shorttype;
         }
     }
-    $paramlist = '?';
-    foreach ($upgradabletypes as $index => $upgradabletype) {
-        if ($index > 0) {
-            $paramlist .= ', ?';
-        }
-    }
 
-    $records = $DB->get_records_sql('SELECT id from {assignment} where assignmenttype in (' . $paramlist . ')', $upgradabletypes);
+    list($sql, $params) = $DB->get_in_or_equal($upgradabletypes);
+
+    $records = $DB->get_records_sql('SELECT id from {assignment} where assignmenttype ' . $sql, $params);
     $ids = array();
     foreach ($records as $record) {
         $ids[] = $record->id;