diff --git a/admin/tool/unsuproles/index.php b/admin/tool/unsuproles/index.php index c6d2f361055..f010f72d0e1 100644 --- a/admin/tool/unsuproles/index.php +++ b/admin/tool/unsuproles/index.php @@ -61,7 +61,7 @@ if ($action === 'delete') { //show confirmation echo $OUTPUT->header(); $yesurl = new moodle_url($PAGE->url, array('roleid'=>$roleid, 'contextlevel'=>$contextlevel, 'action'=>'delete', 'confirm'=>1, 'sesskey'=>sesskey())); - $levelname = get_contextlevel_name($contextlevel); + $levelname = context_helper::get_level_name($contextlevel); $rolename = format_string($role->name); $message = get_string('confirmdelete', 'tool_unsuproles', array('level'=>$levelname, 'role'=>$rolename)); echo $OUTPUT->confirm($message, $yesurl, $PAGE->url); @@ -96,7 +96,7 @@ if (!$problems) { $roles = get_all_roles(); $data = array(); foreach ($problems as $problem) { - $levelname = get_contextlevel_name($problem->contextlevel); + $levelname = context_helper::get_level_name($problem->contextlevel); $rolename = role_get_name($roles[$problem->roleid]); //TODO: show list of users if count low $count = $problem->racount; diff --git a/lib/accesslib.php b/lib/accesslib.php index 9a44a01eedf..56077c9f558 100644 --- a/lib/accesslib.php +++ b/lib/accesslib.php @@ -7302,17 +7302,6 @@ function delete_context($contextlevel, $instanceid, $deleterecord = true) { return true; } -/** - * Returns context level name - * - * @deprecated since 2.2 - * @param integer $contextlevel $context->context level. One of the CONTEXT_... constants. - * @return string the name for this type of context. - */ -function get_contextlevel_name($contextlevel) { - return context_helper::get_level_name($contextlevel); -} - /** * Prints human readable context identifier. * diff --git a/lib/deprecatedlib.php b/lib/deprecatedlib.php index 844a934463f..9ba5a297ab9 100644 --- a/lib/deprecatedlib.php +++ b/lib/deprecatedlib.php @@ -5093,3 +5093,16 @@ function context_instance_preload(stdClass $rec) { debugging('context_instance_preload() is deprecated, please use context_helper::preload_from_record() instead.', DEBUG_DEVELOPER); context_helper::preload_from_record($rec); } + +/** + * Returns context level name + * + * @deprecated since 2.2 + * @see context_helper::get_level_name() + * @param integer $contextlevel $context->context level. One of the CONTEXT_... constants. + * @return string the name for this type of context. + */ +function get_contextlevel_name($contextlevel) { + debugging('get_contextlevel_name() is deprecated, please use context_helper::get_level_name() instead.', DEBUG_DEVELOPER); + return context_helper::get_level_name($contextlevel); +} diff --git a/lib/tests/accesslib_test.php b/lib/tests/accesslib_test.php index 86281edef84..74294a53d72 100644 --- a/lib/tests/accesslib_test.php +++ b/lib/tests/accesslib_test.php @@ -2464,6 +2464,7 @@ class accesslib_testcase extends advanced_testcase { $this->assertFalse($DB->record_exists('context', array('contextlevel'=>CONTEXT_COURSE, 'instanceid'=>$testcourses[2]))); $name = get_contextlevel_name(CONTEXT_COURSE); + $this->assertDebuggingCalled('get_contextlevel_name() is deprecated, please use context_helper::get_level_name() instead.', DEBUG_DEVELOPER); $this->assertFalse(empty($name)); $context = context_course::instance($testcourses[2]); diff --git a/lib/upgrade.txt b/lib/upgrade.txt index 1f7d2d347f3..a9082e644cf 100644 --- a/lib/upgrade.txt +++ b/lib/upgrade.txt @@ -20,6 +20,7 @@ information provided here is intended especially for developers. * preload_course_contexts() is deprecated, please use context_helper::preload_course(). * context_moved() is deprecated, please use context::update_moved(). * context_instance_preload() is deprecated, please use context_helper::preload_from_record(). +* get_contextlevel_name() is deprecated, please use context_helper::get_level_name(). === 2.5.1 ===