SAK-40219 Error in logs that calendarcounter has null value

mrmodise · Oct 30, 2018 · e990774 · e990774
1 parent 4baa245
commit e990774
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/content/content-tool/tool/src/webapp/vm/resources/sakai_properties_scripts.vm b/content/content-tool/tool/src/webapp/vm/resources/sakai_properties_scripts.vm
@@ -1565,7 +1565,7 @@
 document.calendars = new Array();
 document.calendarcounter = 0;
 
-#if($calendarcounter > 0)	
+#if($calendarcounter && $calendarcounter > 0)	
 	document.calendars = new Array();
 	document.calendarcounter = $calendarcounter;
 #set($n = $calendarcounter - 1)
@@ -1577,7 +1577,7 @@ document.calendarcounter = 0;
 #end
 #end
 </script>
-#if($calendarcounter > 0)
+#if($calendarcounter && $calendarcounter > 0)
 #javascript("/library/calendar/sakai-calendar.js")
 #javascript("/library/calendar/js/calendar2.js")
 #end