The numeric file mounts of a user were overridden by the real paths (…

…see #5083)
contao · Nov 30, 2012 · 361e858 · 361e858
1 parent 37fa3a3
commit 361e858
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 6 deletions.
diff --git a/system/docs/CHANGELOG.md b/system/docs/CHANGELOG.md
@@ -1,6 +1,13 @@
 Contao Open Source CMS Changelog
 ================================
 
+Version 3.0.2 (201X-XX-XX)
+--------------------------
+
+### Fixed
+The numeric file mounts of a user were overridden by the real paths (see #5083).
+
+
 Version 3.0.1 (2012-11-29)
 --------------------------
 

diff --git a/system/modules/core/classes/BackendUser.php b/system/modules/core/classes/BackendUser.php
@@ -282,6 +282,18 @@ public function isAllowed($int, $row)
 	}
 
 
+	/**
+	 * Restore the original numeric file mounts (see #5083)
+	 */
+	public function save()
+	{
+		$filemounts = $this->filemounts;
+		$this->arrData['filemounts'] = $this->arrFilemountIds;
+		parent::save();
+		$this->filemounts = $filemounts;
+	}
+
+
 	/**
 	 * Set all user properties from a database record
 	 */
@@ -342,8 +354,7 @@ protected function setUserFromDb()
 				{
 					$value = deserialize($objGroup->$field, true);
 
-					// The new page/file picker can return integers instead of arrays,
-					// so use empty() instead of is_array() and deserialize(true) here
+					// The new page/file picker can return integers instead of arrays, so use empty() instead of is_array() and deserialize(true) here
 					if (!empty($value))
 					{
 						$this->$field = array_merge((is_array($this->$field) ? $this->$field : (($this->$field != '') ? array($this->$field) : array())), $value);

diff --git a/system/modules/core/classes/FrontendUser.php b/system/modules/core/classes/FrontendUser.php
@@ -275,13 +275,12 @@ public function findBy($strColumn, $varValue)
 
 	/**
 	 * Restore the original group membership
-	 * @param boolean
 	 */
-	public function save($blnForceInsert=false)
+	public function save()
 	{
 		$groups = $this->groups;
 		$this->arrData['groups'] = $this->arrGroups;
-		parent::save($blnForceInsert);
+		parent::save();
 		$this->groups = $groups;
 	}
 

diff --git a/system/modules/core/widgets/FileSelector.php b/system/modules/core/widgets/FileSelector.php
@@ -145,7 +145,6 @@ public function generate()
 		}
 		else
 		{
-
 			// Show a custom path (see #4926)
 			if ($GLOBALS['TL_DCA'][$this->strTable]['fields'][$this->strField]['eval']['path'] != '')
 			{