Merge branch 'hotfix/3.5.24'

Author: leofeyer

build.xml

@@ -7,6 +7,7 @@
   </target>
 
   <target name="clone">
+    <echo message="Cloning into contao-${version}" />
     <exec executable="git">
       <arg value="clone" />
       <arg value="." />

system/config/constants.php

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

system/docs/CHANGELOG.md

@@ -1,6 +1,16 @@
 Contao Open Source CMS changelog
 ================================
 
+Version 3.5.24 (2017-01-19)
+---------------------------
+
+### Fixed
+Correctly handle SVGZ files in the file manager (also fixes #8624).
+
+### Fixed
+Revert the download element changes (see #8620).
+
+
 Version 3.5.23 (2017-01-17)
 ---------------------------
 

system/modules/core/classes/Versions.php

@@ -31,12 +31,6 @@ class Versions extends \Controller
 	 */
 	protected $intPid;
 
-	/**
-	 * File path
-	 * @var string
-	 */
-	protected $strPath;
-
 	/**
 	 * Edit URL
 	 * @var string
@@ -69,17 +63,6 @@ public function __construct($strTable, $intPid)
 
 		$this->strTable = $strTable;
 		$this->intPid = $intPid;
-
-		// Store the path if it is an editable file
-		if ($strTable == 'tl_files')
-		{
-			$objFile = \FilesModel::findByPk($intPid);
-
-			if ($objFile !== null && in_array($objFile->extension, trimsplit(',', strtolower(\Config::get('editableFiles')))))
-			{
-				$this->strPath = $objFile->path;
-			}
-		}
 	}
 
 
@@ -163,17 +146,23 @@ public function create()
 			return;
 		}
 
-		if ($this->strPath !== null)
+		// Store the content if it is an editable file
+		if ($this->strTable == 'tl_files')
 		{
-			$objFile = new \File($this->strPath, true);
+			$objModel = \FilesModel::findByPk($this->intPid);
 
-			if ($objFile->extension == 'svgz')
+			if ($objModel !== null && in_array($objModel->extension, trimsplit(',', strtolower(\Config::get('editableFiles')))))
 			{
-				$objRecord->content = gzdecode($objFile->getContent());
-			}
-			else
-			{
-				$objRecord->content = $objFile->getContent();
+				$objFile = new \File($objModel->path, true);
+
+				if ($objFile->extension == 'svgz')
+				{
+					$objRecord->content = gzdecode($objFile->getContent());
+				}
+				else
+				{
+					$objRecord->content = $objFile->getContent();
+				}
 			}
 		}
 
@@ -278,12 +267,26 @@ public function restore($intVersion)
 			return;
 		}
 
-		// Restore the content
-		if ($this->strPath !== null)
+		// Restore the content if it is an editable file
+		if ($this->strTable == 'tl_files')
 		{
-			$objFile = new \File($this->strPath, true);
-			$objFile->write($data['content']);
-			$objFile->close();
+			$objModel = \FilesModel::findByPk($this->intPid);
+
+			if ($objModel !== null && in_array($objModel->extension, trimsplit(',', strtolower(\Config::get('editableFiles')))))
+			{
+				$objFile = new \File($objModel->path, true);
+
+				if ($objFile->extension == 'svgz')
+				{
+					$objFile->write(gzencode($data['content']));
+				}
+				else
+				{
+					$objFile->write($data['content']);
+				}
+
+				$objFile->close();
+			}
 		}
 
 		// Get the currently available fields

system/modules/core/drivers/DC_Folder.php

@@ -2012,6 +2012,8 @@ protected function save($varValue)
 					{
 						\Dbafs::addResource($this->strPath . '/' . $varValue . $this->strExtension);
 					}
+
+					$this->blnCreateNewVersion = true;
 				}
 
 				$this->log('File or folder "'.$this->strPath.'/'.$this->varValue.$this->strExtension.'" has been renamed to "'.$this->strPath.'/'.$varValue.$this->strExtension.'"', __METHOD__, TL_FILES);

system/modules/core/elements/ContentDownload.php

@@ -85,17 +85,7 @@ protected function compile()
 			$this->linkTitle = specialchars($objFile->basename);
 		}
 
-		/** @var \PageModel $objPage */
-		global $objPage;
-
-		if ($objPage instanceof \PageModel)
-		{
-			$strHref = $objPage->getFrontendUrl() . (Environment::get('queryString') ? '?' . Environment::get('queryString') : '');
-		}
-		else
-		{
-			$strHref = \Environment::get('request');
-		}
+		$strHref = \Environment::get('request');
 
 		// Remove an existing file parameter (see #5683)
 		if (preg_match('/(&(amp;)?|\?)file=/', $strHref))

system/modules/core/elements/ContentDownloads.php

@@ -146,14 +146,7 @@ protected function compile()
 					$arrMeta['title'] = specialchars($objFile->basename);
 				}
 
-				if ($objPage instanceof \PageModel)
-				{
-					$strHref = $objPage->getFrontendUrl() . (Environment::get('queryString') ? '?' . Environment::get('queryString') : '');
-				}
-				else
-				{
-					$strHref = \Environment::get('request');
-				}
+				$strHref = \Environment::get('request');
 
 				// Remove an existing file parameter (see #5683)
 				if (preg_match('/(&(amp;)?|\?)file=/', $strHref))
@@ -229,14 +222,7 @@ protected function compile()
 						$arrMeta['title'] = specialchars($objFile->basename);
 					}
 
-					if ($objPage instanceof \PageModel)
-					{
-						$strHref = $objPage->getFrontendUrl() . (Environment::get('queryString') ? '?' . Environment::get('queryString') : '');
-					}
-					else
-					{
-						$strHref = \Environment::get('request');
-					}
+					$strHref = \Environment::get('request');
 
 					// Remove an existing file parameter (see #5683)
 					if (preg_match('/(&(amp;)?|\?)file=/', $strHref))

system/modules/repository/classes/RepositorySettings.php

@@ -17,6 +17,7 @@
 
 // valid core versions in descending order
 define('REPOSITORY_COREVERSIONS',
+		'30050249,30050249;'.	// 3.5.24
 		'30050239,30050239;'.	// 3.5.23
 		'30050229,30050229;'.	// 3.5.22
 		'30050219,30050219;'.	// 3.5.21