Permalink
Browse files

Partially merge w07_MDL-25575_20_contexttrouble. See PULL-299

  • Loading branch information...
2 parents 7d87147 + 28765cf commit 396dca7cb92927cbf7954adb8776cd850aad80cf @stronk7 stronk7 committed Feb 14, 2011
Showing with 5 additions and 1 deletion.
  1. +5 −1 lib/accesslib.php
View
@@ -2352,6 +2352,10 @@ function get_context_info_array($contextid) {
* @return int|bool related course id or false
*/
function get_courseid_from_context($context) {
+ if (empty($context->contextlevel)) {
+ debugging('Invalid context object specified in get_courseid_from_context() call');
+ return false;
+ }
if ($context->contextlevel == CONTEXT_COURSE) {
return $context->instanceid;
}
@@ -2370,7 +2374,7 @@ function get_courseid_from_context($context) {
if ($context->contextlevel == CONTEXT_BLOCK) {
$parentcontexts = get_parent_contexts($context, false);
$parent = reset($parentcontexts);
- return get_courseid_from_context($parent);
+ return get_courseid_from_context(get_context_instance_by_id($parent));
}
return false;

0 comments on commit 396dca7

Please sign in to comment.