Merge branch 'hotfix/3.4.3'

contao · Jan 30, 2015 · f54bd55 · f54bd55
2 parents b7d0a7e + 2292b6a
commit f54bd55
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 4 deletions.
diff --git a/contao/install.php b/contao/install.php
@@ -17,7 +17,7 @@
 
 // Show error messages
 @ini_set('display_errors', 1);
-@error_reporting(E_ALL|E_STRICT);
+error_reporting(Config::get('errorReporting'));
 
 // Run the controller
 $controller = new BackendInstall;

diff --git a/system/config/constants.php b/system/config/constants.php
@@ -13,7 +13,7 @@
  * Core version
  */
 define('VERSION', '3.4');
-define('BUILD', '2');
+define('BUILD', '3');
 define('LONG_TERM_SUPPORT', false);
 
 

diff --git a/system/docs/CHANGELOG.md b/system/docs/CHANGELOG.md
@@ -1,6 +1,16 @@
 Contao Open Source CMS changelog
 ================================
 
+Version 3.4.3 (2015-01-30)
+--------------------------
+
+### Fixed
+Consider the error reporting level in the install tool (see #7593).
+
+### Fixed
+Handle variables and functions when importing style sheets (see #7448).
+
+
 Version 3.4.2 (2015-01-22)
 --------------------------
 

diff --git a/system/modules/core/classes/StyleSheets.php b/system/modules/core/classes/StyleSheets.php
@@ -1473,8 +1473,8 @@ protected function createDefinition($arrDefinition)
 				continue;
 			}
 
-			// Handle important definitions
-			if (strpos($strDefinition, 'important') !== false || strpos($strDefinition, 'transparent') !== false || strpos($strDefinition, 'inherit') !== false)
+			// Handle keywords, variables and functions (see #7448)
+			if (strpos($strDefinition, 'important') !== false || strpos($strDefinition, 'transparent') !== false || strpos($strDefinition, 'inherit') !== false || strpos($strDefinition, '$') !== false || strpos($strDefinition, '(') !== false)
 			{
 				$arrSet['own'][] = $strDefinition;
 				continue;

diff --git a/system/modules/repository/classes/RepositorySettings.php b/system/modules/repository/classes/RepositorySettings.php
@@ -17,6 +17,7 @@
 
 // valid core versions in descending order
 define('REPOSITORY_COREVERSIONS',
+		'30040039,30040039;'.	// 3.4.3
 		'30040029,30040029;'.	// 3.4.2
 		'30040019,30040019;'.	// 3.4.1
 		'30040009,30040009;'.	// 3.4.0
@@ -33,6 +34,7 @@
 		'30030007,30030007;'.	// 3.3.0-RC2
 		'30030006,30030006;'.	// 3.3.0-RC1
 		'30030003,30030003;'.	// 3.3.0-beta1
+		'30020189,30020189;'.	// 3.2.18
 		'30020179,30020179;'.	// 3.2.17
 		'30020169,30020169;'.	// 3.2.16
 		'30020159,30020159;'.	// 3.2.15