Merge branch '4.10'

martinschumann · Sep 24, 2020 · e6a28d4 · e6a28d4
2 parents cd33da3 + 710ac94
commit e6a28d4
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 15 deletions.
diff --git a/src/Resources/contao/dca/tl_files.php b/src/Resources/contao/dca/tl_files.php
@@ -827,13 +827,7 @@ public function showFile($row, $href, $label, $title, $icon, $attributes)
 	 */
 	public function protectFolder(DataContainer $dc)
 	{
-		if (!$dc->activeRecord || !$dc->activeRecord->path)
-		{
-			// This should never happen, because DC_Folder does not support "override all"
-			throw new InvalidArgumentException('The DataContainer object does not contain a valid active record');
-		}
-
-		$strPath = $dc->activeRecord->path;
+		$strPath = $dc->id;
 		$projectDir = System::getContainer()->getParameter('kernel.project_dir');
 
 		// Only show for folders (see #5660)

diff --git a/src/Resources/contao/dca/tl_module.php b/src/Resources/contao/dca/tl_module.php
@@ -791,7 +791,7 @@ public function getGroupHeader($group, $mode, $field, $row)
 	 */
 	public function getActivationDefault($varValue)
 	{
-		if (!trim($varValue))
+		if (trim($varValue) === '')
 		{
 			$varValue = (is_array($GLOBALS['TL_LANG']['tl_module']['emailText']) ? $GLOBALS['TL_LANG']['tl_module']['emailText'][1] : $GLOBALS['TL_LANG']['tl_module']['emailText']);
 		}
@@ -808,7 +808,7 @@ public function getActivationDefault($varValue)
 	 */
 	public function getPasswordDefault($varValue)
 	{
-		if (!trim($varValue))
+		if (trim($varValue) === '')
 		{
 			$varValue = (is_array($GLOBALS['TL_LANG']['tl_module']['passwordText']) ? $GLOBALS['TL_LANG']['tl_module']['passwordText'][1] : $GLOBALS['TL_LANG']['tl_module']['passwordText']);
 		}

diff --git a/src/Resources/contao/drivers/DC_Folder.php b/src/Resources/contao/drivers/DC_Folder.php
@@ -2386,7 +2386,7 @@ protected function save($varValue)
 				}
 
 				// Set the correct empty value (see #6284, #6373)
-				if ($varValue === '')
+				if ((string) $varValue === '')
 				{
 					$varValue = Widget::getEmptyValueByFieldType($GLOBALS['TL_DCA'][$this->strTable]['fields'][$this->strField]['sql']);
 				}

diff --git a/src/Resources/contao/drivers/DC_Table.php b/src/Resources/contao/drivers/DC_Table.php
@@ -3170,7 +3170,7 @@ protected function save($varValue)
 			}
 
 			// Set the correct empty value (see #6284, #6373)
-			if ($varValue === '')
+			if ((string) $varValue === '')
 			{
 				$varValue = Widget::getEmptyValueByFieldType($GLOBALS['TL_DCA'][$this->strTable]['fields'][$this->strField]['sql']);
 			}

diff --git a/src/Resources/contao/helper/functions.php b/src/Resources/contao/helper/functions.php
@@ -182,7 +182,7 @@ function deserialize($varValue, $blnForceArray=false)
 	}
 
 	// Empty string
-	if (!trim($varValue))
+	if (trim($varValue) === '')
 	{
 		return $blnForceArray ? array() : '';
 	}

diff --git a/src/Resources/contao/library/Contao/SqlFileParser.php b/src/Resources/contao/library/Contao/SqlFileParser.php
@@ -44,7 +44,7 @@ public static function parse($file)
 			$subpatterns = array();
 
 			// Unset comments and empty lines
-			if (preg_match('/^[#-]+/', $v) || !trim($v))
+			if (preg_match('/^[#-]+/', $v) || trim($v) === '')
 			{
 				unset($data[$k]);
 				continue;

diff --git a/src/Resources/contao/library/Contao/StringUtil.php b/src/Resources/contao/library/Contao/StringUtil.php
@@ -873,7 +873,7 @@ public static function deserialize($varValue, $blnForceArray=false)
 		}
 
 		// Empty string
-		if (!trim($varValue))
+		if (trim($varValue) === '')
 		{
 			return $blnForceArray ? array() : '';
 		}

diff --git a/src/Resources/contao/library/Contao/Widget.php b/src/Resources/contao/library/Contao/Widget.php
@@ -810,7 +810,7 @@ protected function validator($varInput)
 			$varInput = trim($varInput);
 		}
 
-		if (!$varInput)
+		if ((string) $varInput === '')
 		{
 			if (!$this->mandatory)
 			{