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

This commit is contained in:
Damyon Wiese 2013-07-16 14:49:25 +08:00
commit ed9e492087
7 changed files with 27 additions and 20 deletions

View file

@ -2476,8 +2476,11 @@ class accesslib_testcase extends advanced_testcase {
$this->assertDebuggingCalled('print_context_name() is deprecated, please use $context->get_context_name() instead.', DEBUG_DEVELOPER);
$this->assertFalse(empty($name));
$url = get_context_url($coursecontext);
$this->assertFalse($url instanceof modole_url);
$url1 = get_context_url($coursecontext);
$this->assertDebuggingCalled('get_context_url() is deprecated, please use $context->get_url() instead.', DEBUG_DEVELOPER);
$url2 = $coursecontext->get_url();
$this->assertEquals($url1, $url2);
$this->assertFalse($url2 instanceof modole_url);
$pagecm = get_coursemodule_from_instance('page', $testpages[7]);
$context = context_module::instance($pagecm->id);