L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-48807-master' of git://github.com/lameze/moodle

Browse Source
This commit is contained in:
Andrew Nicols
2015-02-23 14:46:59 +08:00
parent 40b10c304a 77df1778f2
commit 49e6309f08
3 changed files with 33 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/accesslib.php
+30 -15
View File
@@ -6447,14 +6447,17 @@ class context_user extends context {
protected static function create_level_instances() {
global $DB;
$sql = "INSERT INTO {context} (contextlevel, instanceid)
SELECT ".CONTEXT_USER.", u.id
$sql = "SELECT ".CONTEXT_USER.", u.id
FROM {user} u
WHERE u.deleted = 0
AND NOT EXISTS (SELECT 'x'
FROM {context} cx
WHERE u.id = cx.instanceid AND cx.contextlevel=".CONTEXT_USER.")";
$DB->execute($sql);
if ($contextdata = $DB->get_records_sql($sql)) {
foreach ($contextdata as $context) {
context::insert_context_record(CONTEXT_USER, $context->id, null);
}
}
}
/**
@@ -6655,13 +6658,16 @@ class context_coursecat extends context {
protected static function create_level_instances() {
global $DB;
$sql = "INSERT INTO {context} (contextlevel, instanceid)
SELECT ".CONTEXT_COURSECAT.", cc.id
$sql = "SELECT ".CONTEXT_COURSECAT.", cc.id
FROM {course_categories} cc
WHERE NOT EXISTS (SELECT 'x'
FROM {context} cx
WHERE cc.id = cx.instanceid AND cx.contextlevel=".CONTEXT_COURSECAT.")";
$DB->execute($sql);
if ($contextdata = $DB->get_records_sql($sql)) {
foreach ($contextdata as $context) {
context::insert_context_record(CONTEXT_COURSECAT, $context->id, null);
}
}
}
/**
@@ -6878,13 +6884,16 @@ class context_course extends context {
protected static function create_level_instances() {
global $DB;
$sql = "INSERT INTO {context} (contextlevel, instanceid)
SELECT ".CONTEXT_COURSE.", c.id
$sql = "SELECT ".CONTEXT_COURSE.", c.id
FROM {course} c
WHERE NOT EXISTS (SELECT 'x'
FROM {context} cx
WHERE c.id = cx.instanceid AND cx.contextlevel=".CONTEXT_COURSE.")";
$DB->execute($sql);
if ($contextdata = $DB->get_records_sql($sql)) {
foreach ($contextdata as $context) {
context::insert_context_record(CONTEXT_COURSE, $context->id, null);
}
}
}
/**
@@ -7132,13 +7141,16 @@ class context_module extends context {
protected static function create_level_instances() {
global $DB;
$sql = "INSERT INTO {context} (contextlevel, instanceid)
SELECT ".CONTEXT_MODULE.", cm.id
$sql = "SELECT ".CONTEXT_MODULE.", cm.id
FROM {course_modules} cm
WHERE NOT EXISTS (SELECT 'x'
FROM {context} cx
WHERE cm.id = cx.instanceid AND cx.contextlevel=".CONTEXT_MODULE.")";
$DB->execute($sql);
if ($contextdata = $DB->get_records_sql($sql)) {
foreach ($contextdata as $context) {
context::insert_context_record(CONTEXT_MODULE, $context->id, null);
}
}
}
/**
@@ -7349,13 +7361,16 @@ class context_block extends context {
protected static function create_level_instances() {
global $DB;
$sql = "INSERT INTO {context} (contextlevel, instanceid)
SELECT ".CONTEXT_BLOCK.", bi.id
$sql = "SELECT ".CONTEXT_BLOCK.", bi.id
FROM {block_instances} bi
WHERE NOT EXISTS (SELECT 'x'
FROM {context} cx
WHERE bi.id = cx.instanceid AND cx.contextlevel=".CONTEXT_BLOCK.")";
$DB->execute($sql);
if ($contextdata = $DB->get_records_sql($sql)) {
foreach ($contextdata as $context) {
context::insert_context_record(CONTEXT_BLOCK, $context->id, null);
}
}
}
/**
lib/db/tasks.php
+2 -2
View File
@@ -125,8 +125,8 @@ $tasks = array(
array(
'classname' => 'core\task\create_contexts_task',
'blocking' => 1,
'minute' => '*',
'hour' => '*',
'minute' => '0',
'hour' => '0',
'day' => '*',
'dayofweek' => '*',
'month' => '*'
version.php
+1 -1
View File
@@ -29,7 +29,7 @@
defined('MOODLE_INTERNAL') || die();
$version = 2015021900.00; // YYYYMMDD = weekly release date of this DEV branch.
$version = 2015022300.00; // YYYYMMDD = weekly release date of this DEV branch.
// RR = release increments - 00 in DEV branches.
// .XX = incremental changes.