From: defacer <defacer>
Date: Fri, 14 May 2004 07:34:10 +0000 (+0000)
Subject: Fix for bug 1354:
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=1bb9d624c499c32618e5b6f5d5349a9fa27d6845;p=moodle.git

Fix for bug 1354:

(REAL fix this time! ;-)

Thanks for the report, Eloy. I now know what I was doing wrong. Because on my
dev site I have the same TZ as the server, sometimes I can make mistakes and
"get away with them". :-/
---

diff --git a/calendar/lib.php b/calendar/lib.php
index 6af01e2cf9..ad313a70ce 100644
--- a/calendar/lib.php
+++ b/calendar/lib.php
@@ -169,7 +169,7 @@ function calendar_get_mini($courses, $groups, $users, $cal_month = false, $cal_y
                 $popupcontent .= '<div><a href=\\\''.CALENDAR_URL.'view.php?view=event&amp;id='.$events[$eventid]->id.'\\\'>'.addslashes(htmlspecialchars($events[$eventid]->name)).'</a></div>';
             }
 
-            $popupcaption = get_string('eventsfor', 'calendar', strftime(get_string('strftimedayshort'), $events[$eventid]->timestart));
+            $popupcaption = get_string('eventsfor', 'calendar', userdate($events[$eventid]->timestart, get_string('strftimedayshort')));
             $popup = 'onmouseover="return overlib(\''.$popupcontent.'\', CAPTION, \''.$popupcaption.'\');" onmouseout="return nd();"';
 
             // Class and cell content