Merge branch 'hotfix/3.5.4'

assets/contao/css/debug-uncompressed.css

@@ -6,6 +6,12 @@
  * @license LGPL-3.0+
  */
 
+#contao-debug {
+	position:fixed;
+	bottom:0;
+	left:0;
+	width:100%;
+}
 #contao-debug * {
 	color:#444;
 	line-height:1;
@@ -19,6 +25,7 @@
 	border-top:1px solid #666;
 	border-bottom:1px solid #bbb;
 	position:fixed;
+	width: 100%;
 	bottom:260px;
 	background:#ddd;
 	background-image:-moz-linear-gradient(top, #eee, #ddd);
@@ -53,17 +60,25 @@
 	bottom:0;
 	overflow:auto;
 	background:#fff;
+	width: 100%;
 }
 #contao-debug pre {
 	padding:10px;
+	font-size:12px;
 }
 #contao-debug pre,#contao-debug pre * {
 	font-family:Courier,monospace;
 }
-#contao-debug.closed p {
+.debug-enabled {
+	margin-bottom:297px;
+}
+.debug-closed {
+	margin-bottom:36px;
+}
+.debug-closed #contao-debug p {
 	bottom:-1px;
 }
-#contao-debug.closed div {
+.debug-closed #contao-debug div {
 	height:0;
 }
 #contao-debug #debug-tog {
@@ -74,6 +89,6 @@
 	background:url("../../../system/themes/default/images/expand.gif") right 5px no-repeat;
 	cursor:pointer;
 }
-#contao-debug.closed #debug-tog {
+.debug-closed #contao-debug #debug-tog {
 	background-image:url("../../../system/themes/default/images/collapse.gif");
-}
+}

assets/contao/js/core-uncompressed.js

@@ -1311,7 +1311,7 @@ var Backend =
 		});
 
 		var list = new Sortables(ul, {
-			contstrain: true,
+			constrain: true,
 			opacity: 0.6,
 			onStart: function() {
 				ds.start();
@@ -1382,7 +1382,7 @@ var Backend =
 	 */
 	makeMultiSrcSortable: function(id, oid) {
 		var list = new Sortables($(id), {
-			contstrain: true,
+			constrain: true,
 			opacity: 0.6
 		}).addEvent('complete', function() {
 			var els = [],
@@ -1402,7 +1402,7 @@ var Backend =
 	makeWizardsSortable: function() {
 		$$('.tl_listwizard').each(function(el) {
 			new Sortables(el, {
-				contstrain: true,
+				constrain: true,
 				opacity: 0.6,
 				handle: '.drag-handle'
 			});
@@ -1411,7 +1411,7 @@ var Backend =
 		$$('.tl_tablewizard').each(function(el) {
 			var els = el.getElement('.sortable');
 			new Sortables(els, {
-				contstrain: true,
+				constrain: true,
 				opacity: 0.6,
 				handle: '.drag-handle',
 				onComplete: function() {
@@ -1422,15 +1422,15 @@ var Backend =
 
 		$$('.tl_modulewizard').each(function(el) {
 			new Sortables(el.getElement('.sortable'), {
-				contstrain: true,
+				constrain: true,
 				opacity: 0.6,
 				handle: '.drag-handle'
 			});
 		});
 
 		$$('.tl_optionwizard').each(function(el) {
 			new Sortables(el.getElement('.sortable'), {
-				contstrain: true,
+				constrain: true,
 				opacity: 0.6,
 				handle: '.drag-handle'
 			});
@@ -1441,7 +1441,7 @@ var Backend =
 			if (els.hasClass('sortable-done')) return;
 
 			new Sortables(els, {
-				contstrain: true,
+				constrain: true,
 				opacity: 0.6,
 				handle: '.drag-handle'
 			});
@@ -1505,7 +1505,7 @@ var Backend =
 		}
 
 		new Sortables(list, {
-			contstrain: true,
+			constrain: true,
 			opacity: 0.6,
 			handle: '.drag-handle'
 		});
@@ -1623,7 +1623,7 @@ var Backend =
 		Backend.tableWizardResort(tbody);
 
 		new Sortables(tbody, {
-			contstrain: true,
+			constrain: true,
 			opacity: 0.6,
 			handle: '.drag-handle',
 			onComplete: function() {
@@ -1757,7 +1757,7 @@ var Backend =
 		}
 
 		new Sortables(tbody, {
-			contstrain: true,
+			constrain: true,
 			opacity: 0.6,
 			handle: '.drag-handle'
 		});
@@ -1833,7 +1833,7 @@ var Backend =
 		}
 
 		new Sortables(tbody, {
-			contstrain: true,
+			constrain: true,
 			opacity: 0.6,
 			handle: '.drag-handle'
 		});
@@ -1902,7 +1902,7 @@ var Backend =
 		}
 
 		new Sortables(tbody, {
-			contstrain: true,
+			constrain: true,
 			opacity: 0.6,
 			handle: '.drag-handle'
 		});

build.xml

@@ -39,12 +39,12 @@
     <delete dir="contao-${version}/.tx" />
     <delete dir="contao-${version}/.git" />
     <delete dir="contao-${version}/vendor/simplepie/simplepie/compatibility_test" />
-    <delete dir="contao-${version}/vendor/tecnick.com/tcpdf/examples" />
+    <delete dir="contao-${version}/vendor/tecnickcom/tcpdf/examples" />
     <delete includeemptydirs="true" verbose="true">
       <fileset dir="contao-${version}/vendor" includes="*/*/demo/**,*/*/doc/**,*/*/docs/**,*/*/notes/**,*/*/site/**,*/*/test/**,*/*/tests/**" />
     </delete>
     <delete includeemptydirs="true" verbose="true">
-      <fileset dir="contao-${version}/vendor/tecnick.com/tcpdf/fonts" excludes="courier.php,freeserif*.*,helvetica*.php" />
+      <fileset dir="contao-${version}/vendor/tecnickcom/tcpdf/fonts" excludes="courier.php,freeserif*.*,helvetica*.php" />
     </delete>
   </target>
 

composer.json

@@ -18,7 +18,7 @@
 		"phpspec/php-diff": "~1.0",
 		"simplepie/simplepie": "~1.3",
 		"swiftmailer/swiftmailer": "~5.2",
-		"tecnick.com/tcpdf": "~6.0",
+		"tecnickcom/tcpdf": "~6.0",
 		"true/punycode": "~1.0",
 		"contao-components/compass": "~0.12"
 	}

system/config/constants.php

@@ -13,7 +13,7 @@
  * Core version
  */
 define('VERSION', '3.5');
-define('BUILD', '3');
+define('BUILD', '4');
 define('LONG_TERM_SUPPORT', true);
 
 

system/config/tcpdf.php

@@ -11,11 +11,11 @@
 
 /**
  * This is the TCPDF (PDF generator) configuration file. See
- * vendor/tecnick.com/tcpdf for more information.
+ * vendor/tecnickcom/tcpdf for more information.
  */
 define('K_TCPDF_EXTERNAL_CONFIG', true);
-define('K_PATH_MAIN', TL_ROOT . '/vendor/tecnick.com/tcpdf/');
-define('K_PATH_URL', Environment::get('base') . 'vendor/tecnick.com/tcpdf/');
+define('K_PATH_MAIN', TL_ROOT . '/vendor/tecnickcom/tcpdf/');
+define('K_PATH_URL', Environment::get('base') . 'vendor/tecnickcom/tcpdf/');
 define('K_PATH_FONTS', K_PATH_MAIN . 'fonts/');
 define('K_PATH_CACHE', TL_ROOT . '/system/tmp/');
 define('K_PATH_URL_CACHE', TL_ROOT . '/system/tmp/');