moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'wip-MDL-34189-master' of git://github.com/marinaglancy/moodle

Browse source
This commit is contained in:
Sam Hemelryk 2014-07-29 16:15:24 +12:00
commit efe3aefaf2
10 changed files with 383 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/accesslib.php
View file

@ -5156,7 +5156,7 @@ abstract class context extends stdClass implements IteratorAggregate {
* @return void (modifies $rec)
*/
protected static function preload_from_record(stdClass $rec) {
if (empty($rec->ctxid) or empty($rec->ctxlevel) or empty($rec->ctxinstance) or empty($rec->ctxpath) or empty($rec->ctxdepth)) {
if (empty($rec->ctxid) or empty($rec->ctxlevel) or !isset($rec->ctxinstance) or empty($rec->ctxpath) or empty($rec->ctxdepth)) {
// $rec does not have enough data, passed here repeatedly or context does not exist yet
return;
}