MDL-21147 renamed find_renderer back to get_renderer() - there are no more collisions...

diff --git a/lib/blocklib.php b/lib/blocklib.php
index 7620e5df6dbb33011366ebed64d901181a6c1ab1..b3d0507cb3cf2bbbfcceaf7814c82276a453fdfa 100644 (file)
--- 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 9536026bd015d6c89dd1953d6d360fcf64199059..df0a112a05aa4a9125fa376598efe0ba7fccee2c 100644 (file)
--- 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 db0a5bb66f7c60fcf57f142908ecf45e00355771..b79b5106f35f8ffe8575221d77d1e164f032aa02 100644 (file)
--- 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 5d3b01d63b6573d1200521bf7345f6b1b29f6100..223022f44359fa4617b33fdd425e6796b653101d 100644 (file)
--- 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 42f4f72b737b3867890632ff05df183e98a4d8e8..165007598dfdabaa031af9b16385c2607fc8b0b6 100644 (file)
--- 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 4c46a3db3f63e8f3116c309ae7d4b2dbe19c011c..0b00f2459761b0775c92f07289ec2c1dab7a73e8 100644 (file)
--- 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 5e9a60ba6b2bf969c4e6bf253924056ccff1535a..f04e637a55c3d0bc92725d4444005dadedbe88f6 100644 (file)
--- 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 87bd7e45dfc37ed809be55391a5b7aa633a64fd8..10bac3ff8a28e8c797abb2338873e902f0915094 100644 (file)
--- 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 2cb842a2805c111567d14648c7d5e442d1720fd2..c09256862255a0333cf37fa1817bf7dd33911051 100644 (file)
--- 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 376aeed604417b3a66c1b61d7bb3500b2e717192..f635405fc8196cbc80101cf55aa665b19914a80b 100644 (file)
--- 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 73aeec7726b1cb2726e67488a638a6900b081de3..6cba7e644b0b41eb7fbb6e526cbc70914799376a 100644 (file)
--- 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 9164f0a267e99eb63103a2b57adec5827bda6082..6fdbe648125dc1215c6262f2eb8a5622f0c7ed1e 100644 (file)
--- 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 28895b79a976b9d129a6cedacc96bb484021d3a2..eb4008f7ddcabf573937116db417330b8a29db92 100644 (file)
--- 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 a1aabcf67ddf4d49cbfb657638984c4ec46fca81..69f943c7899f1c955521086c4c2e7a1dc9753553 100644 (file)
--- 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 e837992c16e845b611fa4b9098ae16b1f8979ca9..2361bbdc641e6952fa957a48da4eccc6e4c5969c 100644 (file)
--- 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 f0b10ef48c9fdd5eb67caa4dcffb9afa9527f90c..b8e1c29656bcf4d7014cfaf55c74961da3e6d66b 100644 (file)
--- 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();