From 0530a64e9146a32f57212603c1a05c56979bda27 Mon Sep 17 00:00:00 2001 From: plegall Date: Fri, 11 Sep 2020 10:34:06 +0200 Subject: [PATCH] fixes #1222 define calendar constants in calendar_base.class So that we can include both calendar_weekly and calendar_monthly in the same script. --- include/calendar_base.class.php | 8 ++++++++ include/calendar_monthly.class.php | 8 -------- include/calendar_weekly.class.php | 8 -------- 3 files changed, 8 insertions(+), 16 deletions(-) diff --git a/include/calendar_base.class.php b/include/calendar_base.class.php index 0eecdeadb..1b59919a2 100644 --- a/include/calendar_base.class.php +++ b/include/calendar_base.class.php @@ -10,6 +10,14 @@ * @package functions\calendar */ +/** level of year view */ +define('CYEAR', 0); +/** level of week view in weekly view */ +define('CWEEK', 1); +/** level of month view in monthly view */ +define('CMONTH', 1); +/** level of day view */ +define('CDAY', 2); /** * Base class for monthly and weekly calendar styles diff --git a/include/calendar_monthly.class.php b/include/calendar_monthly.class.php index c577fc0ad..3172a56f8 100644 --- a/include/calendar_monthly.class.php +++ b/include/calendar_monthly.class.php @@ -12,14 +12,6 @@ include_once(PHPWG_ROOT_PATH.'include/calendar_base.class.php'); -/** level of year view */ -define('CYEAR', 0); -/** level of month view */ -define('CMONTH', 1); -/** level of day view */ -define('CDAY', 2); - - /** * Monthly calendar style (composed of years/months and days) */ diff --git a/include/calendar_weekly.class.php b/include/calendar_weekly.class.php index cca2f7f91..b9bb9beca 100644 --- a/include/calendar_weekly.class.php +++ b/include/calendar_weekly.class.php @@ -12,14 +12,6 @@ include_once(PHPWG_ROOT_PATH.'include/calendar_base.class.php'); -/** level of year view */ -define('CYEAR', 0); -/** level of week view */ -define('CWEEK', 1); -/** level of day view */ -define('CDAY', 2); - - /** * Weekly calendar style (composed of years/week in years and days in week) */