diff --git a/calendar/inc/class.calendar.inc.php b/calendar/inc/class.calendar.inc.php index a0cdff286d..f9cda31633 100755 --- a/calendar/inc/class.calendar.inc.php +++ b/calendar/inc/class.calendar.inc.php @@ -14,28 +14,6 @@ /* $Id$ */ -if(extension_loaded('mcal') == False) -{ - define(RECUR_NONE,0); - define(RECUR_DAILY,1); - define(RECUR_WEEKLY,2); - define(RECUR_MONTHLY_MDAY,3); - define(RECUR_MONTHLY_WDAY,4); - define(RECUR_YEARLY,5); - - define(M_SUNDAY,1); - define(M_MONDAY,2); - define(M_TUESDAY,4); - define(M_WEDNESDAY,8); - define(M_THURSDAY,16); - define(M_FRIDAY,32); - define(M_SATURDAY,64); - - define(M_WEEKDAYS,63); - define(M_WEEKEND,65); - define(M_ALLDAYS,127); -} - CreateObject('calendar.calendar_item'); if($phpgw_info['server']['calendar_type'] == 'mcal' && extension_loaded('mcal') == False) { diff --git a/calendar/inc/class.calendar__.inc.php b/calendar/inc/class.calendar__.inc.php index 1d5bc62d7e..5f90b68a6f 100755 --- a/calendar/inc/class.calendar__.inc.php +++ b/calendar/inc/class.calendar__.inc.php @@ -14,6 +14,28 @@ /* $Id$ */ +if(extension_loaded('mcal') == False) +{ + define(RECUR_NONE,0); + define(RECUR_DAILY,1); + define(RECUR_WEEKLY,2); + define(RECUR_MONTHLY_MDAY,3); + define(RECUR_MONTHLY_WDAY,4); + define(RECUR_YEARLY,5); + + define(M_SUNDAY,1); + define(M_MONDAY,2); + define(M_TUESDAY,4); + define(M_WEDNESDAY,8); + define(M_THURSDAY,16); + define(M_FRIDAY,32); + define(M_SATURDAY,64); + + define(M_WEEKDAYS,63); + define(M_WEEKEND,65); + define(M_ALLDAYS,127); +} + define('MSG_DELETED',0); define('MSG_MODIFIED',1); define('MSG_ADDED',2);