Update Controller.php

agoat · Sep 7, 2016 · 4576467 · 4576467
1 parent 557eb8a
commit 4576467
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/Resources/contao/classes/Controller.php b/src/Resources/contao/classes/Controller.php
@@ -173,11 +173,10 @@ public function addPageLayoutToBE ($objTemplate)
 				// add content block template js
 				$this->addContentBlockJS();
 
-				// add jquery if active in layout
+				// add jquery to the backend if active in layout
 				if ($objLayout->addJQuery && $objLayout->backendJS)
 				{
-					//array_unshift($GLOBALS['TL_JAVASCRIPT'], 'system/modules/contentblocks/assets/jquery.noConflict.js|static');
-					array_unshift($GLOBALS['TL_JAVASCRIPT'], 'assets/jquery/core/' . $GLOBALS['TL_ASSETS']['JQUERY'] . '/jquery.min.js|static');
+					array_unshift($GLOBALS['TL_JAVASCRIPT'], 'assets/jquery/js/jquery.min.js|static');
 				}