BUGFIX: CalendarWidget not respecting jquery_included

guyvanbael · Jan 9, 2013 · 028fbfd · 028fbfd
1 parent d8ff595
commit 028fbfd
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/code/CalendarWidget.php b/code/CalendarWidget.php
@@ -1,4 +1,3 @@
-
 <?php
 
 
@@ -55,12 +54,14 @@ public function setSelectionEnd($date) {
 
 
 	public function forTemplate() {
-		Requirements::javascript(THIRDPARTY_DIR."/jquery/jquery.js");		
+		if(!Calendar::$jquery_included) {
+			Requirements::javascript(THIRDPARTY_DIR."/jquery/jquery.js");
+		}
 		Requirements::javascript("event_calendar/javascript/calendar_widget.js");
 		$locale_file = _t('Calendar.DATEJSFILE','calendar_en.js');
 		Requirements::javascript("event_calendar/javascript/lang/{$locale_file}");
 		Requirements::javascript("event_calendar/javascript/calendar_widget_init.js");
 		Requirements::css("event_calendar/css/calendar_widget.css");
 		return '<div class="calendar-widget" ' . $this->getDataAttributes() . '></div>';
 	}
-}
+}