Fix for bug 1462:

Warnings removed.

diff --git a/calendar/lib.php b/calendar/lib.php
index d8e558fa7f2f47c01bab99bcc2f303550ec35d01..4d1170b2f9bbef3fab09bebb3d811979f8db1854 100644 (file)
--- a/calendar/lib.php
+++ b/calendar/lib.php
@@ -120,12 +120,12 @@ function calendar_get_mini($courses, $groups, $users, $cal_month = false, $cal_y
     // will also set the $SESSION->cal_courses_shown variable to that one course. Otherwise, we 'd need to add extra
     // arguments to this function.
 
-    $courses = array_diff($courses, array(1));
-    if(count($courses) == 1) {
-        $morehref = '&course='.reset($courses);
-    }
-    else {
-        $morehref = '';
+    $morehref = '';
+    if(!empty($courses)) {
+        $courses = array_diff($courses, array(1));
+        if(count($courses) == 1) {
+            $morehref = '&course='.reset($courses);
+        }
     }
 
     // We want to have easy access by day, since the display is on a per-day basis.
@@ -305,12 +305,12 @@ function calendar_get_upcoming($courses, $groups, $users, $daysinfuture, $maxeve
     // will also set the $SESSION->cal_courses_shown variable to that one course. Otherwise, we 'd need to add extra
     // arguments to this function.
 
-    $courses = array_diff($courses, array(1));
-    if(count($courses) == 1) {
-        $morehref = '&course='.reset($courses);
-    }
-    else {
-        $morehref = '';
+    $morehref = '';
+    if(!empty($courses)) {
+        $courses = array_diff($courses, array(1));
+        if(count($courses) == 1) {
+            $morehref = '&course='.reset($courses);
+        }
     }
 
     if($events !== false) {