Merge branch 'hotfix/3.3.5'

.htaccess.default

@@ -248,7 +248,7 @@ FileETag None
   #   RewriteRule .*\.txt$ index.php [L]    # URL suffix .txt
   #   RewriteRule .*\.json$ index.php [L]   # URL suffix .json
   #
-  # If you do not want to use an URL suffix at all, you have to add a second
+  # If you do not want to use an URL suffix at all, you have to add a third
   # line to prevent URLs that point to folders from being rewritten (see #4031).
   #
   #   RewriteCond %{REQUEST_FILENAME} !-d

assets/contao/css/layout-uncompressed.css

@@ -120,10 +120,10 @@ select,input,textarea {
  * Custom layout sections
  */
 .custom {
-    display:block;
+	display:block;
 }
 #container:after,.custom:after {
-    content:"";
-    display:table;
-    clear:both;
+	content:"";
+	display:table;
+	clear:both;
 }

build.xml

@@ -27,20 +27,22 @@
     <exec executable="composer" dir="contao-${version}" failonerror="true">
       <arg value="install" />
       <arg value="--prefer-dist" />
+      <arg value="--no-dev" />
+      <arg value="--no-scripts" />
     </exec>
   </target>
 
   <target name="purge">
     <delete dir="contao-${version}/.tx" />
     <delete dir="contao-${version}/.git" />
-    <delete dir="contao-${version}/vendor/leafo/lessphp/site" />
-    <delete dir="contao-${version}/vendor/leafo/scssphp/tests" />
-    <delete dir="contao-${version}/vendor/leafo/scssphp/site" />
-    <delete dir="contao-${version}/vendor/simplepie/simplepie/demo" />
-    <delete dir="contao-${version}/vendor/simplepie/simplepie/tests" />
     <delete dir="contao-${version}/vendor/simplepie/simplepie/compatibility_test" />
-    <delete dir="contao-${version}/vendor/swiftmailer/swiftmailer/test-suite" />
-    <delete dir="contao-${version}/vendor/swiftmailer/swiftmailer/tests" />
+    <delete dir="contao-${version}/vendor/tecnick.com/tcpdf/examples" />
+    <delete includeemptydirs="true" verbose="true">
+      <fileset dir="contao-${version}/vendor" includes="*/*/demo/**,*/*/doc/**,*/*/docs/**,*/*/notes/**,*/*/site/**,*/*/tests/**" />
+    </delete>
+    <delete includeemptydirs="true" verbose="true">
+      <fileset dir="contao-${version}/vendor/tecnick.com/tcpdf/fonts" excludes="courier.php,freeserif*.*,helvetica*.php" />
+    </delete>
   </target>
 
   <target name="archive">

composer.json

@@ -13,12 +13,12 @@
 		"php": ">=5.3.2",
 		"contao/idna": "dev-master",
 		"contao/php-diff": "dev-master",
-		"contao/tcpdf": "dev-master",
 		"simplepie/simplepie": "~1.3",
 		"swiftmailer/swiftmailer": "~5.2",
 		"michelf/php-markdown": "~1.4",
 		"leafo/scssphp": "dev-master",
 		"leafo/scssphp-compass": "dev-master",
-		"leafo/lessphp": "~0.4"
+		"leafo/lessphp": "~0.4",
+		"tecnick.com/tcpdf": "~6.0"
 	}
 }

system/config/constants.php

@@ -15,7 +15,7 @@
  * Core version
  */
 define('VERSION', '3.3');
-define('BUILD', '4');
+define('BUILD', '5');
 define('LONG_TERM_SUPPORT', false);
 
 

system/docs/CHANGELOG.md

@@ -1,6 +1,40 @@
 Contao Open Source CMS changelog
 ================================
 
+Version 3.3.5 (2014-08-27)
+--------------------------
+
+### Fixed
+Do not output an empty `label` tag (see #7249).
+
+### Fixed
+Allow floating point numbers in "number" input fields (see #7257).
+
+### Fixed
+Do not adjust the start time of past events (see #7121).
+
+### Fixed
+Reset the image margins if it exceeds the maximum image size (see #7245).
+
+### Fixed
+Reset `$blnPreventSaving` when a model is cloned (see #7243).
+
+### Fixed
+Do not reload after storing `CURRENT_ID` in the session (see #7240).
+
+### Fixed
+Correctly validate the page number of the versions menu (see #7235).
+
+### Fixed
+Handle underscores in the Google+ vanity name (see #7241).
+
+### Fixed
+Correctly handle the `rem` unit when importing style sheets (see #7220).
+
+### Fixed
+Fix two issues with the extension repository theme.
+
+
 Version 3.3.4 (2014-07-29)
 --------------------------
 

system/helper/mbstring.php

@@ -63,16 +63,16 @@ function utf8_chr($dec)
 	if ($dec < 128)
 		return chr($dec);
 
-    if ($dec < 2048)
-    	return chr(($dec >> 6) + 192) . chr(($dec & 63) + 128);
+	if ($dec < 2048)
+		return chr(($dec >> 6) + 192) . chr(($dec & 63) + 128);
 
-    if ($dec < 65536)
-    	return chr(($dec >> 12) + 224) . chr((($dec >> 6) & 63) + 128) . chr(($dec & 63) + 128);
+	if ($dec < 65536)
+		return chr(($dec >> 12) + 224) . chr((($dec >> 6) & 63) + 128) . chr(($dec & 63) + 128);
 
-    if ($dec < 2097152)
-    	return chr(($dec >> 18) + 240) . chr((($dec >> 12) & 63) + 128) . chr((($dec >> 6) & 63) + 128) . chr(($dec & 63) + 128);
+	if ($dec < 2097152)
+		return chr(($dec >> 18) + 240) . chr((($dec >> 12) & 63) + 128) . chr((($dec >> 6) & 63) + 128) . chr(($dec & 63) + 128);
 
-    return '';
+	return '';
 }
 
 

system/modules/calendar/classes/Events.php

@@ -208,7 +208,7 @@ protected function addEvent($objEvents, $intStart, $intEnd, $strUrl, $intBegin,
 		$span = \Calendar::calculateSpan($intStart, $intEnd);
 
 		// Adjust the start time of a multi-day event (see #6802)
-		if ($this->cal_noSpan && $span > 0 && $intStart < $intBegin)
+		if ($this->cal_noSpan && $span > 0 && $intStart < $intBegin && $intBegin < $intEnd)
 		{
 			$intStart = $intBegin;
 		}

system/modules/core/classes/Backend.php

@@ -327,7 +327,6 @@ protected function getBackendModule($module)
 		if ($id != $this->Session->get('CURRENT_ID'))
 		{
 			$this->Session->set('CURRENT_ID', $id);
-			$this->reload();
 		}
 
 		define('CURRENT_ID', (\Input::get('table') ? $id : \Input::get('id')));