MDL-11843 deleting of activities directly from calendar is dangerous/confusing; merge...

diff --git a/calendar/lib.php b/calendar/lib.php
index dbeb4a6a951bd56304e2e0724be502f14ab620f3..703d88db9ec364182d60694a1a631f81a2fd790f 100644 (file)
--- a/calendar/lib.php
+++ b/calendar/lib.php
@@ -557,14 +557,16 @@ function calendar_print_event($event) {
             $deletelink = CALENDAR_URL.'event.php?action=delete&id='.$event->id.$calendarcourseid;
         } else {
             $editlink   = $CFG->wwwroot.'/course/mod.php?update='.$event->cmid.'&return=true&sesskey='.$USER->sesskey;
-            $deletelink = $CFG->wwwroot.'/course/mod.php?delete='.$event->cmid.'&sesskey='.$USER->sesskey;;
+            $deletelink = ''; // deleting activities directly from calendar is dangerous/confusing - see MDL-11843
         }
         echo ' <a href="'.$editlink.'"><img
                   src="'.$CFG->pixpath.'/t/edit.gif" alt="'.get_string('tt_editevent', 'calendar').'"
                   title="'.get_string('tt_editevent', 'calendar').'" /></a>';
-        echo ' <a href="'.$deletelink.'"><img
-                  src="'.$CFG->pixpath.'/t/delete.gif" alt="'.get_string('tt_deleteevent', 'calendar').'"
-                  title="'.get_string('tt_deleteevent', 'calendar').'" /></a>';
+        if ($deletelink) {
+            echo ' <a href="'.$deletelink.'"><img
+                      src="'.$CFG->pixpath.'/t/delete.gif" alt="'.get_string('tt_deleteevent', 'calendar').'"
+                      title="'.get_string('tt_deleteevent', 'calendar').'" /></a>';
+        }
         echo '</div>';
     }
     echo '</td></tr></table>';