From ef4d3233b675c47868ab3c8495ea448e28559bac Mon Sep 17 00:00:00 2001
From: Damyon Wiese <damyon@moodle.com>
Date: Tue, 7 May 2013 14:04:52 +0800
Subject: [PATCH] MDL-38596 coursecatlib performance

Version bump for cache definitions and added user delete check to sql
---
 lib/coursecatlib.php | 5 +++--
 version.php          | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/coursecatlib.php b/lib/coursecatlib.php
index 607342d7db3..6cf2ea1d3f3 100644
--- a/lib/coursecatlib.php
+++ b/lib/coursecatlib.php
@@ -711,6 +711,7 @@ class coursecat implements renderable, cacheable_object, IteratorAggregate {
         list($sql1, $params1) = $DB->get_in_or_equal(array_keys($allcontexts), SQL_PARAMS_NAMED, 'ctxid');
         list($sql2, $params2) = $DB->get_in_or_equal($managerroles, SQL_PARAMS_NAMED, 'rid');
         list($sort, $sortparams) = users_order_by_sql('u');
+        $notdeleted = array('notdeleted'=>0);
         $sql = "SELECT ra.contextid, ra.id AS raid,
                        r.id AS roleid, r.name AS rolename, r.shortname AS roleshortname,
                        rn.name AS rolecoursealias, u.id, u.username, u.firstname, u.lastname
@@ -718,9 +719,9 @@ class coursecat implements renderable, cacheable_object, IteratorAggregate {
                   JOIN {user} u ON ra.userid = u.id
                   JOIN {role} r ON ra.roleid = r.id
              LEFT JOIN {role_names} rn ON (rn.contextid = ra.contextid AND rn.roleid = r.id)
-                WHERE  ra.contextid ". $sql1." AND ra.roleid ". $sql2."
+                WHERE  ra.contextid ". $sql1." AND ra.roleid ". $sql2." AND u.deleted = :notdeleted
              ORDER BY r.sortorder, $sort";
-        $rs = $DB->get_recordset_sql($sql, $params1 + $params2 + $sortparams);
+        $rs = $DB->get_recordset_sql($sql, $params1 + $params2 + $notdeleted + $sortparams);
         $checkenrolments = array();
         foreach($rs as $ra) {
             foreach ($allcontexts[$ra->contextid] as $id) {
diff --git a/version.php b/version.php
index 75f8d4d3a77..22eff69830a 100644
--- a/version.php
+++ b/version.php
@@ -29,7 +29,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$version  = 2013050600.01;              // YYYYMMDD      = weekly release date of this DEV branch
+$version  = 2013050700.00;              // YYYYMMDD      = weekly release date of this DEV branch
                                         //         RR    = release increments - 00 in DEV branches
                                         //           .XX = incremental changes