From d9e1326536a832f4ada65ad6e878b1db00fa4472 Mon Sep 17 00:00:00 2001 From: Dan Poltawski Date: Fri, 27 Apr 2012 09:36:37 +0800 Subject: [PATCH] MDL-32508 course: deprecate get_section_url format callback --- course/format/topics/lib.php | 11 ----------- course/format/weeks/lib.php | 11 ----------- lib/navigationlib.php | 12 ++++++++++-- 3 files changed, 10 insertions(+), 24 deletions(-) diff --git a/course/format/topics/lib.php b/course/format/topics/lib.php index 18688eae088..710abaf318e 100644 --- a/course/format/topics/lib.php +++ b/course/format/topics/lib.php @@ -80,14 +80,3 @@ function callback_topics_ajax_support() { $ajaxsupport->testedbrowsers = array('MSIE' => 6.0, 'Gecko' => 20061111, 'Safari' => 531, 'Chrome' => 6.0); return $ajaxsupport; } - -/** - * Returns a URL to arrive directly at a section - * - * @param int $courseid The id of the course to get the link for - * @param int $sectionnum The section number to jump to - * @return moodle_url - */ -function callback_topics_get_section_url($courseid, $sectionnum) { - return new moodle_url('/course/view.php', array('id' => $courseid, 'topic' => $sectionnum)); -} \ No newline at end of file diff --git a/course/format/weeks/lib.php b/course/format/weeks/lib.php index 3c36383c014..9201c9e2d6f 100644 --- a/course/format/weeks/lib.php +++ b/course/format/weeks/lib.php @@ -102,14 +102,3 @@ function callback_weeks_ajax_support() { $ajaxsupport->testedbrowsers = array('MSIE' => 6.0, 'Gecko' => 20061111, 'Safari' => 531, 'Chrome' => 6.0); return $ajaxsupport; } - -/** - * Returns a URL to arrive directly at a section - * - * @param int $courseid The id of the course to get the link for - * @param int $sectionnum The section number to jump to - * @return moodle_url - */ -function callback_weeks_get_section_url($courseid, $sectionnum) { - return new moodle_url('/course/view.php', array('id' => $courseid, 'week' => $sectionnum)); -} diff --git a/lib/navigationlib.php b/lib/navigationlib.php index f0eb367a796..0336362b9ef 100644 --- a/lib/navigationlib.php +++ b/lib/navigationlib.php @@ -1762,7 +1762,10 @@ class global_navigation extends navigation_node { $viewhiddensections = has_capability('moodle/course:viewhiddensections', $this->page->context); $urlfunction = 'callback_'.$courseformat.'_get_section_url'; - if ($course->coursedisplay == COURSE_DISPLAY_SINGLEPAGE || !function_exists($urlfunction)) { + if (function_exists($urlfunction)) { + debugging('Depricated callback_'.$courseformat.'_get_section_url in use. + Please switch your code to use the standard section url param'); + } else { $urlfunction = null; } @@ -1788,8 +1791,13 @@ class global_navigation extends navigation_node { } $url = null; - if (!empty($urlfunction)) { + if ($urlfunction) { + // pre 2.3 style format url $url = $urlfunction($course->id, $section->section); + }else{ + if ($course->coursedisplay == COURSE_DISPLAY_MULTIPAGE) { + $url = course_get_url($course, $section->section); + } } $sectionnode = $coursenode->add($sectionname, $url, navigation_node::TYPE_SECTION, null, $section->id); $sectionnode->nodetype = navigation_node::NODETYPE_BRANCH; -- 2.43.0