diff --git a/admin/tool/monitor/classes/subscription_manager.php b/admin/tool/monitor/classes/subscription_manager.php
index ff8ba16fb80..ea4b5135939 100644
--- a/admin/tool/monitor/classes/subscription_manager.php
+++ b/admin/tool/monitor/classes/subscription_manager.php
@@ -234,9 +234,9 @@ class subscription_manager {
         global $DB;
 
         // Store all the subscriptions we have to delete.
-        if ($subscriptions = $DB->get_records('tool_monitor_subscriptions', array('courseid' => $coursecontext->instanceid))) {
+        if ($subscriptions = $DB->get_records('tool_monitor_subscriptions', ['courseid' => $coursecontext->instanceid])) {
             // Delete subscriptions in bulk.
-            $DB->delete_records('tool_monitor_subscriptions', array('courseid' => $coursecontext->instanceid));
+            $DB->delete_records('tool_monitor_subscriptions', ['courseid' => $coursecontext->instanceid]);
 
             // Trigger events one by one.
             foreach ($subscriptions as $subscription) {
diff --git a/admin/tool/monitor/db/upgrade.php b/admin/tool/monitor/db/upgrade.php
index 55a7446f10c..8866b2c7558 100644
--- a/admin/tool/monitor/db/upgrade.php
+++ b/admin/tool/monitor/db/upgrade.php
@@ -80,10 +80,11 @@ function xmldb_tool_monitor_upgrade($oldversion) {
     if ($oldversion < 2016052306) {
 
         // Delete "orphaned" subscriptions.
-        $deletedcourses = $DB->get_field_sql("SELECT DISTINCT s.courseid
-            FROM {tool_monitor_subscriptions} s
-            LEFT OUTER JOIN {course} c ON c.id = s.courseid
-            WHERE s.courseid <> 0 and c.id IS NULL");
+        $sql = "SELECT DISTINCT s.courseid
+                  FROM {tool_monitor_subscriptions} s
+       LEFT OUTER JOIN {course} c ON c.id = s.courseid
+                 WHERE s.courseid <> 0 and c.id IS NULL";
+        $deletedcourses = $DB->get_field_sql($sql);
         if ($deletedcourses) {
             list($sql, $params) = $DB->get_in_or_equal($deletedcourses);
             $DB->execute("DELETE FROM {tool_monitor_subscriptions} WHERE courseid " . $sql, $params);