summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--ext/mcal/php3_mcal.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 4d95e5282d..3398648532 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,7 +5,8 @@ PHP 4.0 CHANGE LOG ChangeLog
- Ora_Fetch_Into now resets the returned array in all cases (Thies)
- Fixed NULL-Column problem in Oracle-Driver (Thies)
- Added extra metadata functions to ODBC, SQLTables etc (nick@easysoft.com)
-- Fixed SEGV in mcal make_event_object() (Andrew Skalski)
+- Fixed SEGV in mcal make_event_object() and
+ typo in mcal_list_alarms() (Andrew Skalski)
- Fixed Ora_PLogon (Thies)
- Resourcified Oracle (Thies)
- Implemented object serialization/deserialization in WDDX (Andrey)
diff --git a/ext/mcal/php3_mcal.c b/ext/mcal/php3_mcal.c
index 9cfc219e52..0c077904ac 100644
--- a/ext/mcal/php3_mcal.c
+++ b/ext/mcal/php3_mcal.c
@@ -707,7 +707,7 @@ void php3_mcal_list_alarms(INTERNAL_FUNCTION_PARAMETERS)
convert_to_long(min);
convert_to_long(sec);
dt_setdate(&mydate,year->value.lval,month->value.lval,day->value.lval);
- dt_setdate(&mydate,hour->value.lval,min->value.lval,sec->value.lval);
+ dt_settime(&mydate,hour->value.lval,min->value.lval,sec->value.lval);
}
else
{