X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=blobdiff_plain;f=blocks%2Fcourse_overview%2Frenderer.php;h=1dad1ab7b39c7936fdb254ddee766b8147d7ee8b;hp=8923322818f35e65e7ab28084595bf938a199ccd;hb=f58c96f6b04d2e288f9b96113284bc836f1f72d9;hpb=b611ade3abc7f19341db866a2d9c31f53909ba8e

diff --git a/blocks/course_overview/renderer.php b/blocks/course_overview/renderer.php
index 8923322818f..1dad1ab7b39 100644
--- a/blocks/course_overview/renderer.php
+++ b/blocks/course_overview/renderer.php
@@ -325,7 +325,7 @@ class block_course_overview_renderer extends plugin_renderer_base {
      * @return string html string for welcome area.
      */
     public function welcome_area($msgcount) {
-        global $USER;
+        global $CFG, $USER;
         $output = $this->output->box_start('welcome_area');
 
         $picture = $this->output->user_picture($USER, array('size' => 75, 'class' => 'welcome_userpicture'));
@@ -334,16 +334,19 @@ class block_course_overview_renderer extends plugin_renderer_base {
         $output .= $this->output->box_start('welcome_message');
         $output .= $this->output->heading(get_string('welcome', 'block_course_overview', $USER->firstname));
 
-        $plural = 's';
-        if ($msgcount > 0) {
-            $output .= get_string('youhavemessages', 'block_course_overview', $msgcount);
-            if ($msgcount == 1) {
-                $plural = '';
+        if (!empty($CFG->messaging)) {
+            $plural = 's';
+            if ($msgcount > 0) {
+                $output .= get_string('youhavemessages', 'block_course_overview', $msgcount);
+                if ($msgcount == 1) {
+                    $plural = '';
+                }
+            } else {
+                $output .= get_string('youhavenomessages', 'block_course_overview');
             }
-        } else {
-            $output .= get_string('youhavenomessages', 'block_course_overview');
+            $output .= html_writer::link(new moodle_url('/message/index.php'),
+                    get_string('message'.$plural, 'block_course_overview'));
         }
-        $output .= html_writer::link(new moodle_url('/message/index.php'), get_string('message'.$plural, 'block_course_overview'));
         $output .= $this->output->box_end();
         $output .= $this->output->box('', 'flush');
         $output .= $this->output->box_end();