From 649cf95d0b9a77f4a23bf76ab05e08f138b62727 Mon Sep 17 00:00:00 2001 From: Petr Skoda Date: Thu, 17 Dec 2009 14:06:22 +0000 Subject: [PATCH] MDL-21147 renamed find_renderer back to get_renderer() - there are no more collisions with those magic getters --- lib/blocklib.php | 2 +- lib/pagelib.php | 24 ++++++++++++------------ mod/forum/renderer.php | 2 +- mod/forum/subscribers.php | 2 +- mod/lesson/continue.php | 2 +- mod/lesson/edit.php | 2 +- mod/lesson/editpage.php | 2 +- mod/lesson/essay.php | 2 +- mod/lesson/highscores.php | 2 +- mod/lesson/lesson.php | 2 +- mod/lesson/mediafile.php | 2 +- mod/lesson/renderer.php | 2 +- mod/lesson/report.php | 2 +- mod/lesson/view.php | 2 +- webservice/renderer.php | 2 +- webservice/wsdoc.php | 4 ++-- 16 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lib/blocklib.php b/lib/blocklib.php index 7620e5df6d..b3d0507cb3 100644 --- a/lib/blocklib.php +++ b/lib/blocklib.php @@ -1147,7 +1147,7 @@ class block_manager { $editpage->set_title($strheading); $editpage->set_heading($strheading); - $output = $editpage->find_renderer('core'); + $output = $editpage->get_renderer('core'); echo $output->header(); echo $output->heading($strheading, 2); $mform->display(); diff --git a/lib/pagelib.php b/lib/pagelib.php index 9536026bd0..df0a112a05 100644 --- a/lib/pagelib.php +++ b/lib/pagelib.php @@ -167,17 +167,7 @@ class moodle_page { */ protected $_legacypageobject = null; - /** - * Returns instance of page renderer - * @param string $component name such as 'core', 'mod_forum' or 'qtype_multichoice'. - * @param string $subtype optional subtype such as 'news' resulting to 'mod_forum_news' - * @return renderer_base - */ - public function find_renderer($component, $subtype = null) { - return $this->magic_get_theme()->get_renderer($this, $component, $subtype); - } - -/// Getter methods ============================================================= +/// Magic getter methods ============================================================= /// Due to the __get magic below, you normally do not call these as $PAGE->magic_get_x /// methods, but instead use the $PAGE->x syntax. @@ -530,6 +520,16 @@ class moodle_page { /// Other information getting methods ========================================== + /** + * Returns instance of page renderer + * @param string $component name such as 'core', 'mod_forum' or 'qtype_multichoice'. + * @param string $subtype optional subtype such as 'news' resulting to 'mod_forum_news' + * @return renderer_base + */ + public function get_renderer($component, $subtype = null) { + return $this->magic_get_theme()->get_renderer($this, $component, $subtype); + } + /** * Checks to see if there are any items on the navbar object * @return bool true if there are, false if not @@ -1049,7 +1049,7 @@ class moodle_page { if ($this === $PAGE) { $THEME = $this->_theme; - $OUTPUT = $this->find_renderer('core'); + $OUTPUT = $this->get_renderer('core'); } $this->_wherethemewasinitialised = debug_backtrace(); diff --git a/mod/forum/renderer.php b/mod/forum/renderer.php index db0a5bb66f..b79b5106f3 100644 --- a/mod/forum/renderer.php +++ b/mod/forum/renderer.php @@ -44,7 +44,7 @@ class mod_forum_renderer extends renderer_base { * @param moodle_page $page */ public function __construct(moodle_page $page) { - $this->output = $page->find_renderer('core'); + $this->output = $page->get_renderer('core'); parent::__construct($page); } diff --git a/mod/forum/subscribers.php b/mod/forum/subscribers.php index 5d3b01d63b..223022f443 100644 --- a/mod/forum/subscribers.php +++ b/mod/forum/subscribers.php @@ -56,7 +56,7 @@ unset($SESSION->fromdiscussion); add_to_log($course->id, "forum", "view subscribers", "subscribers.php?id=$forum->id", $forum->id, $cm->id); -$forumoutput = $PAGE->find_renderer('mod_forum'); +$forumoutput = $PAGE->get_renderer('mod_forum'); $currentgroup = groups_get_activity_group($cm); $options = array('forumid'=>$forum->id, 'currentgroup'=>$currentgroup, 'context'=>$context); $existingselector = new forum_existing_subscriber_selector('existingsubscribers', $options); diff --git a/mod/lesson/continue.php b/mod/lesson/continue.php index 42f4f72b73..165007598d 100644 --- a/mod/lesson/continue.php +++ b/mod/lesson/continue.php @@ -40,7 +40,7 @@ require_sesskey(); $context = get_context_instance(CONTEXT_MODULE, $cm->id); $canmanage = has_capability('mod/lesson:manage', $context); -$lessonoutput = $PAGE->find_renderer('mod_lesson'); +$lessonoutput = $PAGE->get_renderer('mod_lesson'); $url = new moodle_url($CFG->wwwroot.'/mod/lesson/continue.php', array('id'=>$cm->id)); $PAGE->set_url($url); diff --git a/mod/lesson/edit.php b/mod/lesson/edit.php index 4c46a3db3f..0b00f24597 100644 --- a/mod/lesson/edit.php +++ b/mod/lesson/edit.php @@ -45,7 +45,7 @@ if ($mode != get_user_preferences('lesson_view', 'collapsed') && $mode !== 'sing set_user_preference('lesson_view', $mode); } -$lessonoutput = $PAGE->find_renderer('mod_lesson'); +$lessonoutput = $PAGE->get_renderer('mod_lesson'); $PAGE->navbar->add(get_string('edit')); echo $lessonoutput->header($lesson, $mode); if (!$lesson->has_pages()) { diff --git a/mod/lesson/editpage.php b/mod/lesson/editpage.php index 5e9a60ba6b..f04e637a55 100644 --- a/mod/lesson/editpage.php +++ b/mod/lesson/editpage.php @@ -98,7 +98,7 @@ if ($data = $mform->get_data()) { redirect(new moodle_url($CFG->wwwroot.'/mod/lesson/edit.php', array('id'=>$cm->id))); } -$lessonoutput = $PAGE->find_renderer('mod_lesson'); +$lessonoutput = $PAGE->get_renderer('mod_lesson'); echo $lessonoutput->header($lesson); $mform->display(); echo $lessonoutput->footer(); \ No newline at end of file diff --git a/mod/lesson/essay.php b/mod/lesson/essay.php index 87bd7e45df..10bac3ff8a 100644 --- a/mod/lesson/essay.php +++ b/mod/lesson/essay.php @@ -277,7 +277,7 @@ switch ($mode) { // Log it add_to_log($course->id, 'lesson', 'view grade', "essay.php?id=$cm->id", get_string('manualgrading', 'lesson'), $cm->id); -$lessonoutput = $PAGE->find_renderer('mod_lesson'); +$lessonoutput = $PAGE->get_renderer('mod_lesson'); echo $lessonoutput->header($lesson, 'essay'); switch ($mode) { diff --git a/mod/lesson/highscores.php b/mod/lesson/highscores.php index 2cb842a280..c092568622 100644 --- a/mod/lesson/highscores.php +++ b/mod/lesson/highscores.php @@ -161,7 +161,7 @@ switch ($mode) { // Log it add_to_log($course->id, 'lesson', 'view highscores', "highscores.php?id=$cm->id", $lesson->name, $cm->id); -$lessonoutput = $PAGE->find_renderer('mod_lesson'); +$lessonoutput = $PAGE->get_renderer('mod_lesson'); echo $lessonoutput->header($lesson, 'highscores'); switch ($mode) { diff --git a/mod/lesson/lesson.php b/mod/lesson/lesson.php index 376aeed604..f635405fc8 100644 --- a/mod/lesson/lesson.php +++ b/mod/lesson/lesson.php @@ -52,7 +52,7 @@ $context = get_context_instance(CONTEXT_MODULE, $cm->id); require_capability('mod/lesson:edit', $context); require_sesskey(); -$lessonoutput = $PAGE->find_renderer('mod_lesson'); +$lessonoutput = $PAGE->get_renderer('mod_lesson'); /// Process the action switch ($action) { diff --git a/mod/lesson/mediafile.php b/mod/lesson/mediafile.php index 73aeec7726..6cba7e644b 100644 --- a/mod/lesson/mediafile.php +++ b/mod/lesson/mediafile.php @@ -52,7 +52,7 @@ try { require_login($course, false, $cm); $context = get_context_instance(CONTEXT_MODULE, $cm->id); -$lessonoutput = $PAGE->find_renderer('mod_lesson'); +$lessonoutput = $PAGE->get_renderer('mod_lesson'); // Get the mimetype $mimetype = mimeinfo("type", $lesson->mediafile); diff --git a/mod/lesson/renderer.php b/mod/lesson/renderer.php index 9164f0a267..6fdbe64812 100644 --- a/mod/lesson/renderer.php +++ b/mod/lesson/renderer.php @@ -36,7 +36,7 @@ class mod_lesson_renderer extends renderer_base { * @param moodle_page $page */ public function __construct(moodle_page $page) { - $this->output = $page->find_renderer('core'); + $this->output = $page->get_renderer('core'); parent::__construct($page); } diff --git a/mod/lesson/report.php b/mod/lesson/report.php index 28895b79a9..eb4008f7dd 100644 --- a/mod/lesson/report.php +++ b/mod/lesson/report.php @@ -75,7 +75,7 @@ if ($pageid !== NULL) { } $PAGE->set_url($url); $PAGE->navbar->add(get_string('reports', 'lesson'), new moodle_url($CFG->wwwroot.'/mod/lesson/report.php', array('id'=>$id))); -$lessonoutput = $PAGE->find_renderer('mod_lesson'); +$lessonoutput = $PAGE->get_renderer('mod_lesson'); /// Process any form data before fetching attempts, grades and times if (has_capability('mod/lesson:edit', $context) && $form = data_submitted() && confirm_sesskey()) { diff --git a/mod/lesson/view.php b/mod/lesson/view.php index a1aabcf67d..69f943c789 100644 --- a/mod/lesson/view.php +++ b/mod/lesson/view.php @@ -51,7 +51,7 @@ $PAGE->set_url($url); $context = get_context_instance(CONTEXT_MODULE, $cm->id); $canmanage = has_capability('mod/lesson:manage', $context); -$lessonoutput = $PAGE->find_renderer('mod_lesson'); +$lessonoutput = $PAGE->get_renderer('mod_lesson'); /// Check these for students only TODO: Find a better method for doing this! /// Check lesson availability diff --git a/webservice/renderer.php b/webservice/renderer.php index e837992c16..2361bbdc64 100644 --- a/webservice/renderer.php +++ b/webservice/renderer.php @@ -40,7 +40,7 @@ class core_wsdoc_renderer extends renderer_base { * @param moodle_page $page */ public function __construct(moodle_page $page) { - $this->output = $page->find_renderer('core'); + $this->output = $page->get_renderer('core'); parent::__construct($page); } diff --git a/webservice/wsdoc.php b/webservice/wsdoc.php index f0b10ef48c..b8e1c29656 100644 --- a/webservice/wsdoc.php +++ b/webservice/wsdoc.php @@ -240,7 +240,7 @@ class webservice_documentation_generator { $USER->id = null; echo $OUTPUT->header(); $USER->id = $userid; - $renderer = $PAGE->find_renderer('core', 'wsdoc'); + $renderer = $PAGE->get_renderer('core', 'wsdoc'); echo $renderer->documentation_html($this->functions, $this->username); echo $OUTPUT->footer(); @@ -264,7 +264,7 @@ class webservice_documentation_generator { $PAGE->set_pagelayout('popup'); echo $OUTPUT->header(); - $renderer = $PAGE->find_renderer('core', 'wsdoc'); + $renderer = $PAGE->get_renderer('core', 'wsdoc'); echo $renderer->login_page_html($errormessage); echo $OUTPUT->footer(); -- 2.39.5