Browse Source

Merge 1.10.x

jmontoyaa 8 years ago
parent
commit
af53c1a77b
2 changed files with 4 additions and 4 deletions
  1. 2 1
      main/forum/forumfunction.inc.php
  2. 2 3
      main/inc/lib/usermanager.lib.php

+ 2 - 1
main/forum/forumfunction.inc.php

@@ -5192,8 +5192,9 @@ function send_notifications($forum_id = 0, $thread_id = 0, $post_id = 0)
 
     if (is_array($users_to_be_notified)) {
         foreach ($users_to_be_notified as $value) {
+
             $user_info = api_get_user_info($value['user_id']);
-            $email_body = get_lang('Dear').' '.$user_info['complete_name'].", <br />\n\r";
+            $email_body = get_lang('Dear').' '.api_get_person_name($user_info['firstname'], $user_info['lastname'], null, PERSON_NAME_EMAIL_ADDRESS).", <br />\n\r";
             $email_body .= get_lang('NewForumPost').": ".$current_forum['forum_title'].' - '.$current_thread['thread_title']." <br />\n";
             $email_body .= get_lang('Course').': '.$_course['name'].' - ['.$_course['official_code']."]  <br />\n";
             $email_body .= get_lang('YouWantedToStayInformed')."<br />\n";

+ 2 - 3
main/inc/lib/usermanager.lib.php

@@ -2525,7 +2525,6 @@ class UserManager
                     $ignore_visibility_for_admins
                 );
 
-
                 // Course Coach session visibility.
                 $blockedCourseCount = 0;
                 $closedVisibilityList = array(
@@ -2535,14 +2534,14 @@ class UserManager
 
                 foreach ($courseList as $course) {
                     // Checking session visibility
-                    $visibility = api_get_session_visibility(
+                    $sessionCourseVisibility = api_get_session_visibility(
                         $session_id,
                         $course['real_id'],
                         $ignore_visibility_for_admins
                     );
 
                     $courseIsVisible = !in_array($course['visibility'], $closedVisibilityList);
-                    if ($courseIsVisible == false || $visibility == SESSION_INVISIBLE) {
+                    if ($courseIsVisible === false || $sessionCourseVisibility == SESSION_INVISIBLE) {
                         $blockedCourseCount++;
                     }
                 }