From 7cb8bfdb5c16b5ecf12c869a746d5686b2beae4b Mon Sep 17 00:00:00 2001
From: Dan Poltawski <dan@moodle.com>
Date: Wed, 9 May 2012 10:06:40 +0800
Subject: [PATCH] MDL-32857 course: single topic summary rewriting pluginfile
 urls

---
 course/format/renderer.php | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/course/format/renderer.php b/course/format/renderer.php
index 510de038e4d..57b18208061 100644
--- a/course/format/renderer.php
+++ b/course/format/renderer.php
@@ -146,16 +146,9 @@ abstract class format_section_renderer_base extends plugin_renderer_base {
         }
 
         $o.= html_writer::start_tag('div', array('class' => 'summary'));
+        $o.= $this->format_summary_text($section);
 
-        $context = context_course::instance($section->course);
-        $summarytext = file_rewrite_pluginfile_urls($section->summary, 'pluginfile.php',
-            $context->id, 'course', 'section', $section->id);
-        $summaryformatoptions = new stdClass();
-        $summaryformatoptions->noclean = true;
-        $summaryformatoptions->overflowdiv = true;
-
-        $o.= format_text($summarytext, $section->summaryformat, $summaryformatoptions);
-
+        $context = context_course::instance($course->id);
         if ($PAGE->user_is_editing() && has_capability('moodle/course:update', $context)) {
             $url = new moodle_url('/course/editsection.php', array('id'=>$section->id));
 
@@ -277,7 +270,7 @@ abstract class format_section_renderer_base extends plugin_renderer_base {
         $o.= html_writer::end_tag('a');
 
         $o.= html_writer::start_tag('div', array('class' => 'summarytext'));
-        $o.= format_text($section->summary, $section->summaryformat);
+        $o.= $this->format_summary_text($section);
         $o.= html_writer::end_tag('div');
         $o.= html_writer::end_tag('div');
         $o.= html_writer::end_tag('li');
@@ -576,4 +569,21 @@ abstract class format_section_renderer_base extends plugin_renderer_base {
         }
 
     }
+
+    /**
+     * Generate html for a section summary text
+     *
+     * @param stdClass $section The course_section entry from DB
+     * @return string HTML to output.
+     */
+    protected function format_summary_text($section) {
+        $context = context_course::instance($section->course);
+        $summarytext = file_rewrite_pluginfile_urls($section->summary, 'pluginfile.php',
+            $context->id, 'course', 'section', $section->id);
+
+        $options = new stdClass();
+        $options->noclean = true;
+        $options->overflowdiv = true;
+        return format_text($summarytext, $section->summaryformat, $options);
+    }
 }