harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mario 2018-09-23 19:40:52 +02:00
parent 781fdaafcd
commit a1d1d5dba7
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Zotlabs/Module/Cal.php
View File

@ -75,7 +75,7 @@ class Cal extends \Zotlabs\Web\Controller {
$sql_extra = permissions_sql($channel['channel_id'],get_observer_hash(),'event'); $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); $first_day = (($first_day) ? $first_day : 0);
$htpl = get_markup_template('event_head.tpl'); $htpl = get_markup_template('event_head.tpl');

2
Zotlabs/Module/Events.php
View File

@ -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); $first_day = (($first_day) ? $first_day : 0);
$htpl = get_markup_template('event_head.tpl'); $htpl = get_markup_template('event_head.tpl');

4
include/features.php
View File

@ -358,11 +358,11 @@ function get_features($filtered = true, $level = (-1)) {
t('Events'), t('Events'),
[ [
'cal_first_day', 'events_cal_first_day',
t('Start calendar week on Monday'), t('Start calendar week on Monday'),
t('Default is Sunday'), t('Default is Sunday'),
false, false,
get_config('feature_lock','cal_first_day') get_config('feature_lock','events_cal_first_day')
], ],
[ [