|
|
@ -148,14 +148,19 @@ class AnnouncementEmail |
|
|
|
|
|
|
|
|
|
|
|
if ($users) { |
|
|
|
if ($users) { |
|
|
|
$users = UserManager::get_user_list_by_ids($users, true); |
|
|
|
$users = UserManager::get_user_list_by_ids($users, true); |
|
|
|
} else { |
|
|
|
|
|
|
|
$users = self::all_users(); |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if (!empty($groups)) { |
|
|
|
if (!empty($groups)) { |
|
|
|
$group_users = GroupManager::get_groups_users($groups); |
|
|
|
$group_users = GroupManager::get_groups_users($groups); |
|
|
|
$group_users = UserManager::get_user_list_by_ids($group_users, true); |
|
|
|
$group_users = UserManager::get_user_list_by_ids($group_users, true); |
|
|
|
$users = array_merge($users, $group_users); |
|
|
|
|
|
|
|
|
|
|
|
if (!empty($group_users)) { |
|
|
|
|
|
|
|
$users = array_merge($users, $group_users); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (empty($users)) { |
|
|
|
|
|
|
|
$users = self::all_users(); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
//Clean users just in case |
|
|
|
//Clean users just in case |
|
|
|