From 93782ecdb986c1cecd37ce1bc38a8d49b2f33c38 Mon Sep 17 00:00:00 2001
From: Peter Dias <peter@moodle.com>
Date: Tue, 21 Sep 2021 16:16:18 +0800
Subject: [PATCH] MDL-72413 folder: Use the common module for setting the
 header

---
 mod/folder/renderer.php |  5 +----
 mod/folder/view.php     | 11 -----------
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/mod/folder/renderer.php b/mod/folder/renderer.php
index ed166ea0b1d..eec62c710ae 100644
--- a/mod/folder/renderer.php
+++ b/mod/folder/renderer.php
@@ -47,10 +47,7 @@ class mod_folder_renderer extends plugin_renderer_base {
         }
 
         if (trim($folder->intro)) {
-            if ($folder->display != FOLDER_DISPLAY_INLINE) {
-                $output .= $this->output->box(format_module_intro('folder', $folder, $cm->id),
-                        'generalbox', 'intro');
-            } else if ($cm->showdescription) {
+            if ($folder->display == FOLDER_DISPLAY_INLINE && $cm->showdescription) {
                 // for "display inline" do not filter, filters run at display time.
                 $output .= format_module_intro('folder', $folder, $cm->id, false);
             }
diff --git a/mod/folder/view.php b/mod/folder/view.php
index 90f6587ddaa..fd18474eeca 100644
--- a/mod/folder/view.php
+++ b/mod/folder/view.php
@@ -69,21 +69,10 @@ $PAGE->set_title($course->shortname.': '.$folder->name);
 $PAGE->set_heading($course->fullname);
 $PAGE->set_activity_record($folder);
 
-
 $output = $PAGE->get_renderer('mod_folder');
 
 echo $output->header();
 
-if (!$PAGE->has_secondary_navigation()) {
-    echo $output->heading(format_string($folder->name), 2);
-}
-
-// Render the activity information.
-$cminfo = cm_info::create($cm);
-$completiondetails = \core_completion\cm_completion_details::get_instance($cminfo, $USER->id);
-$activitydates = \core\activity_dates::get_dates_for_module($cminfo, $USER->id);
-echo $output->activity_information($cminfo, $completiondetails, $activitydates);
-
 echo $output->display_folder($folder);
 
 echo $output->footer();