Announcements: fix tags error. uncheck (by default) `send mail to a…

…ll users` option while editing an announcement. --HG-- branch : 3.11
gunet · May 24, 2021 · 2db0143 · 2db0143
1 parent c3c3fb4
commit 2db0143
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/modules/announcements/index.php b/modules/announcements/index.php
@@ -433,7 +433,6 @@ class : 'form-control input-sm',
             } else {
                 $is_visible = 0;
             }
-
             $antitle = $_POST['antitle'];
             $newContent = purify($_POST['newContent']);
             $send_mail = isset($_POST['recipients']) && (count($_POST['recipients'])>0);
@@ -463,9 +462,8 @@ class : 'form-control input-sm',
                     $newContent, $antitle, $start_display, $stop_display, $is_visible, $id);
                 $log_type = LOG_MODIFY;
                 $message = "<div class='alert alert-success'>$langAnnModify</div>";
-
                 if (isset($_POST['tags'])) {
-                    $tagsArray = explode(',', $_POST['tags']);
+                    $tagsArray = $_POST['tags'];
                     $moduleTag = new ModuleElement($id);
                     $moduleTag->syncTags($tagsArray);
                 }
@@ -689,8 +687,12 @@ class : 'form-control input-sm',
                                                     WHERE cu.course_id = ?d
                                                     AND u.email<>''
                                                     AND u.email IS NOT NULL ORDER BY u.surname, u.givenname", $course_id);
-
-        $tool_content .= "<option value='-1' selected><h2>$langAllUsers</h2></option>";
+        if (isset($_GET['addAnnounce'])) {
+            $selected = 'selected';
+        } else {
+            $selected = '';
+        }
+        $tool_content .= "<option value='-1' $selected><h2>$langAllUsers</h2></option>";
         foreach($course_users as $cu) {
             $tool_content .= "<option value='" . q($cu->user_id) . "'>" . q($cu->name) . " (" . q($cu->email) . ")</option>";
         }