Merge branch 'hotfix/3.5.2'

contao · Jul 24, 2015 · ac68761 · ac68761
2 parents 6f5d80a + 23cc957
commit ac68761
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 7 deletions.
diff --git a/system/config/constants.php b/system/config/constants.php
@@ -13,7 +13,7 @@
  * Core version
  */
 define('VERSION', '3.5');
-define('BUILD', '1');
+define('BUILD', '2');
 define('LONG_TERM_SUPPORT', true);
 
 

diff --git a/system/docs/CHANGELOG.md b/system/docs/CHANGELOG.md
@@ -1,6 +1,13 @@
 Contao Open Source CMS changelog
 ================================
 
+Version 3.5.2 (2015-07-24)
+--------------------------
+
+### Fixed
+Revert some of the PhpStorm code inspector changes (see #7937).
+
+
 Version 3.5.1 (2015-07-24)
 --------------------------
 

diff --git a/system/modules/core/controllers/BackendInstall.php b/system/modules/core/controllers/BackendInstall.php
@@ -30,8 +30,6 @@ class BackendInstall extends \Backend
 	 */
 	public function __construct()
 	{
-		parent::__construct();
-
 		$this->import('Config');
 		$this->import('Session');
 

diff --git a/system/modules/core/library/Contao/File.php b/system/modules/core/library/Contao/File.php
@@ -111,8 +111,6 @@ class File extends \System
 	 */
 	public function __construct($strFile, $blnDoNotCreate=false)
 	{
-		parent::__construct();
-
 		// Handle open_basedir restrictions
 		if ($strFile == '.')
 		{

diff --git a/system/modules/core/library/Contao/Folder.php b/system/modules/core/library/Contao/Folder.php
@@ -63,8 +63,6 @@ class Folder extends \System
 	 */
 	public function __construct($strFolder)
 	{
-		parent::__construct();
-
 		// Handle open_basedir restrictions
 		if ($strFolder == '.')
 		{

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',
+		'30050029,30050029;'.	// 3.5.2
 		'30050019,30050019;'.	// 3.5.1
 		'30050009,30050009;'.	// 3.5.0
 		'30050006,30050006;'.	// 3.5.0-RC1