Merge branch 'MDL-33128-master-1' of git://git.luns.net.uk/moodle

diff --cc course/renderer.php
index 22e5e2c,88e2bb5..d43d15c
--- 1/course/renderer.php
--- 2/course/renderer.php
+++ b/course/renderer.php
@@@ -204,6 -196,14 +196,14 @@@ class core_course_renderer extends plug
              $formcontent .= $this->course_modchooser_module_types($activities);
          }
  
 -        // Activities
++        // Resources
+         $resources = array_filter($modules,
+                 create_function('$mod', 'return ($mod->archetype === MOD_CLASS_RESOURCE);'));
+         if (count($resources)) {
+             $formcontent .= $this->course_modchooser_title('resources');
+             $formcontent .= $this->course_modchooser_module_types($resources);
+         }
+ 
          $formcontent .= html_writer::end_tag('div'); // modoptions
          $formcontent .= html_writer::end_tag('div'); // types