Convert binary UUIDs in DC_File before saving (see contao#6893)

Author: leofeyer

system/modules/core/drivers/DC_File.php

@@ -401,30 +401,43 @@ protected function save($varValue)
 			$varValue = $varValue ? true : false;
 		}
 
-		// Convert date formats into timestamps
-		if ($varValue != '' && in_array($arrData['eval']['rgxp'], array('date', 'time', 'datim')))
+		if ($varValue != '')
 		{
-			$objDate = new \Date($varValue, \Config::get($arrData['eval']['rgxp'] . 'Format'));
-			$varValue = $objDate->tstamp;
-		}
+			// Convert binary UUIDs (see #6893)
+			if ($arrData['inputType'] == 'fileTree')
+			{
+				$varValue = deserialize($varValue);
 
-		// Handle entities
-		if ($arrData['inputType'] == 'text' || $arrData['inputType'] == 'textarea')
-		{
-			$varValue = deserialize($varValue);
+				if (!is_array($varValue))
+				{
+					$varValue = \String::binToUuid($varValue);
+				}
+				else
+				{
+					$varValue = serialize(array_map('String::binToUuid', $varValue));
+				}
+			}
 
-			if (!is_array($varValue))
+			// Convert date formats into timestamps
+			if (in_array($arrData['eval']['rgxp'], array('date', 'time', 'datim')))
 			{
-				$varValue = \String::restoreBasicEntities($varValue);
+				$objDate = new \Date($varValue, \Config::get($arrData['eval']['rgxp'] . 'Format'));
+				$varValue = $objDate->tstamp;
 			}
-			else
+
+			// Handle entities
+			if ($arrData['inputType'] == 'text' || $arrData['inputType'] == 'textarea')
 			{
-				foreach ($varValue as $k=>$v)
+				$varValue = deserialize($varValue);
+
+				if (!is_array($varValue))
 				{
-					$varValue[$k] = \String::restoreBasicEntities($v);
+					$varValue = \String::restoreBasicEntities($varValue);
+				}
+				else
+				{
+					$varValue = serialize(array_map('String::restoreBasicEntities', $varValue));
 				}
-
-				$varValue = serialize($varValue);
 			}
 		}