mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-14 12:40:01 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-40462_master' of https://github.com/markn86/moodle

Browse Source
This commit is contained in:
Damyon Wiese 2013-07-16 15:00:46 +08:00
commit 06c8b60936
7 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
grade/report/grader/lib.php
View File

@ -469,7 +469,7 @@ class grade_report_grader extends grade_report {
AND e.status = :estatus
AND e.courseid = :courseid
GROUP BY ue.userid";
$coursecontext = get_course_context($this->context);
$coursecontext = $this->context->get_course_context(true);
$params = array_merge($uparams, array('estatus'=>ENROL_INSTANCE_ENABLED, 'uestatus'=>ENROL_USER_ACTIVE, 'courseid'=>$coursecontext->instanceid));
$useractiveenrolments = $DB->get_records_sql($sql, $params);

12
lib/accesslib.php
View File

@ -7247,18 +7247,6 @@ function context_instance_preload_sql($joinon, $contextlevel, $tablealias) {
return array($select, $join);
}
/**
* Is this context part of any course? if yes return course context,
* if not return null or throw exception.
*
* @deprecated since 2.2, use $context->get_course_context() instead
* @param context $context
* @return course_context context of the enclosing course, null if not found or exception
*/
function get_course_context(context $context) {
return $context->get_course_context(true);
}
/**
* Returns current course id or null if outside of course based on context parameter.
*

13
lib/deprecatedlib.php
View File

@ -4153,3 +4153,16 @@ function get_context_url(context $context) {
return $context->get_url();
}
/**
* Is this context part of any course? if yes return course context,
* if not return null or throw exception.
*
* @deprecated since 2.2
* @see context::get_course_context()
* @param context $context
* @return course_context context of the enclosing course, null if not found or exception
*/
function get_course_context(context $context) {
debugging('get_course_context() is deprecated, please use $context->get_course_context(true) instead.', DEBUG_DEVELOPER);
return $context->get_course_context(true);
}

2
lib/filebrowser/file_info_context_module.php
View File

@ -94,7 +94,7 @@ class file_info_context_module extends file_info {
return null;
}
$coursecontext = get_course_context($this->context);
$coursecontext = $this->context->get_course_context(true);
if (!$this->course->visible and !has_capability('moodle/course:viewhiddencourses', $coursecontext)) {
return null;
}

7
lib/tests/accesslib_test.php
View File

@ -2484,8 +2484,11 @@ class accesslib_testcase extends advanced_testcase {
$pagecm = get_coursemodule_from_instance('page', $testpages[7]);
$context = context_module::instance($pagecm->id);
$coursecontext = get_course_context($context);
$this->assertEquals($coursecontext->contextlevel, CONTEXT_COURSE);
$coursecontext1 = get_course_context($context);
$this->assertDebuggingCalled('get_course_context() is deprecated, please use $context->get_course_context(true) instead.', DEBUG_DEVELOPER);
$coursecontext2 = $context->get_course_context(true);
$this->assertEquals($coursecontext1, $coursecontext2);
$this->assertEquals($coursecontext2->contextlevel, CONTEXT_COURSE);
$this->assertEquals(get_courseid_from_context($context), $pagecm->course);
$caps = fetch_context_capabilities($systemcontext);

1
lib/upgrade.txt
View File

@ -25,6 +25,7 @@ information provided here is intended especially for developers.
* mark_context_dirty($context->path) is deprecated, please use $context->mark_dirty().
* delete_context() is deprecated, please use $context->delete_content() or context_helper::delete_instance().
* get_context_url() is deprecated, please use $context->get_url().
* get_course_context() is deprecated, please use $context->get_course_context().
=== 2.5.1 ===

2
repository/coursefiles/lib.php
View File

@ -183,7 +183,7 @@ class repository_coursefiles extends repository {
public function get_name() {
list($context, $course, $cm) = get_context_info_array($this->context->id);
if (!empty($course)) {
return get_string('courselegacyfiles') . format_string($course->shortname, true, array('context' => get_course_context($context)));
return get_string('courselegacyfiles') . format_string($course->shortname, true, array('context' => $context->get_course_context(true)));
} else {
return get_string('courselegacyfiles');
}