Merge branch 'MDL-30395-MOODLE_21_STABLE' of git://github.com/mouneyr…

…ac/moodle into MOODLE_21_STABLE
moodle · Nov 30, 2011 · ecbbcd5 · ecbbcd5
2 parents 98b10df + 17fa731
commit ecbbcd5
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/blocks/community/renderer.php b/blocks/community/renderer.php
@@ -193,6 +193,8 @@ public function course_list($courses, $huburl, $contextcourseid) {
 
 
                 //Create course content html
+                $blocks = get_plugin_list('block');
+                $activities = get_plugin_list('mod');
                 if (!empty($course->contents)) {
                     $activitieshtml = '';
                     $blockhtml = '';
@@ -202,14 +204,22 @@ public function course_list($courses, $huburl, $contextcourseid) {
                             if (!empty($blockhtml)) {
                                 $blockhtml .= ' - ';
                             }
-                            $blockhtml .= get_string('pluginname', 'block_' . $content->modulename)
-                                    . " (" . $content->contentcount . ")";
+                            if (array_key_exists($content->modulename, $blocks)) {
+                                $blockname = get_string('pluginname', 'block_' . $content->modulename);
+                            } else {
+                                $blockname = $content->modulename;
+                            }
+                            $blockhtml .= $blockname . " (" . $content->contentcount . ")";
                         } else {
                             if (!empty($activitieshtml)) {
                                 $activitieshtml .= ' - ';
                             }
-                            $activitieshtml .= get_string('modulename', $content->modulename)
-                                    . " (" . $content->contentcount . ")";
+                            if (array_key_exists($content->modulename, $activities)) {
+                                $activityname = get_string('modulename', $content->modulename);
+                            } else {
+                                $activityname = $content->modulename;
+                            }
+                            $activitieshtml .= $activityname . " (" . $content->contentcount . ")";
                         }
                     }