aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2018-09-23 19:40:52 +0200
committerMario <mario@mariovavti.com>2018-09-23 19:40:52 +0200
commita1d1d5dba7c975e00bcf8c8dfc8e6ccd13f3df90 (patch)
tree7a61f99523e249b66510bd2edb2cf4a6cb67fb43
parent781fdaafcd6a8086b76409b0a39d8edbca2e04c9 (diff)
downloadvolse-hubzilla-a1d1d5dba7c975e00bcf8c8dfc8e6ccd13f3df90.tar.gz
volse-hubzilla-a1d1d5dba7c975e00bcf8c8dfc8e6ccd13f3df90.tar.bz2
volse-hubzilla-a1d1d5dba7c975e00bcf8c8dfc8e6ccd13f3df90.zip
use different settings for cal_first_day in events and cdav/calendar. This is a tradeoff. It would be better to have one setting for both but if we want to preserve the *all settings* view, this would break its functionality
-rw-r--r--Zotlabs/Module/Cal.php2
-rw-r--r--Zotlabs/Module/Events.php2
-rw-r--r--include/features.php4
3 files changed, 4 insertions, 4 deletions
diff --git a/Zotlabs/Module/Cal.php b/Zotlabs/Module/Cal.php
index 2962d31fd..70098a2a1 100644
--- a/Zotlabs/Module/Cal.php
+++ b/Zotlabs/Module/Cal.php
@@ -75,7 +75,7 @@ class Cal extends \Zotlabs\Web\Controller {
$sql_extra = permissions_sql($channel['channel_id'],get_observer_hash(),'event');
- $first_day = feature_enabled($channel['channel_id'], 'cal_first_day');
+ $first_day = feature_enabled($channel['channel_id'], 'events_cal_first_day');
$first_day = (($first_day) ? $first_day : 0);
$htpl = get_markup_template('event_head.tpl');
diff --git a/Zotlabs/Module/Events.php b/Zotlabs/Module/Events.php
index b63921ce3..7e5204e62 100644
--- a/Zotlabs/Module/Events.php
+++ b/Zotlabs/Module/Events.php
@@ -290,7 +290,7 @@ class Events extends \Zotlabs\Web\Controller {
);
}
- $first_day = feature_enabled(local_channel(), 'cal_first_day');
+ $first_day = feature_enabled(local_channel(), 'events_cal_first_day');
$first_day = (($first_day) ? $first_day : 0);
$htpl = get_markup_template('event_head.tpl');
diff --git a/include/features.php b/include/features.php
index 8b0c5e3f3..37445c643 100644
--- a/include/features.php
+++ b/include/features.php
@@ -358,11 +358,11 @@ function get_features($filtered = true, $level = (-1)) {
t('Events'),
[
- 'cal_first_day',
+ 'events_cal_first_day',
t('Start calendar week on Monday'),
t('Default is Sunday'),
false,
- get_config('feature_lock','cal_first_day')
+ get_config('feature_lock','events_cal_first_day')
],
[