extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-23 00:13:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Calendar - avoid errors from holidays if no country set

Browse Source
This commit is contained in:
nathangray 2017-10-04 09:21:16 -06:00
parent 3314ca2ea0
commit 5183aa2a19
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
calendar/js/et2_widget_view.js
View File

@ -633,7 +633,9 @@ jQuery.extend(et2_calendar_view,
{ {
// Loaded in an iframe or something // Loaded in an iframe or something
var view = egw.window.et2_calendar_view ? egw.window.et2_calendar_view : this; var view = egw.window.et2_calendar_view ? egw.window.et2_calendar_view : this;
if(!view) return {};
// No country selected causes error, so skip if it's missing
if(!view || !egw.preference('country','common')) return {};
var cache = view.holiday_cache[year]; var cache = view.holiday_cache[year];
if (typeof cache == 'undefined') if (typeof cache == 'undefined')