Merge branch 'MDL-58559-master' of git://github.com/lameze/moodle

abgreeve · Apr 18, 2017 · 2660f7d · 2660f7d
2 parents 80483bf + 4e78551
commit 2660f7d
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/blocks/community/renderer.php b/blocks/community/renderer.php
@@ -153,7 +153,8 @@ public function course_list($courses, $huburl, $contextcourseid) {
                                 array('class' => 'hubcourseuserinfo'));
 
                 //create course content related information html
-                $course->subject = get_string($course->subject, 'edufields');
+                $course->subject = (get_string_manager()->string_exists($course->subject, 'edufields')) ?
+                        get_string($course->subject, 'edufields') : get_string('none');
                 $course->audience = get_string('audience' . $course->audience, 'hub');
                 $course->educationallevel = get_string('edulevel' . $course->educationallevel, 'hub');
                 $coursecontentinfo = '';