Correctly synchronize if a sub folder is selected (see #5979)

contao · Aug 16, 2013 · 9e0c03b · 9e0c03b
1 parent 21ecf01
commit 9e0c03b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/system/docs/CHANGELOG.md b/system/docs/CHANGELOG.md
@@ -4,6 +4,9 @@ Contao Open Source CMS Changelog
 Version 3.1.2 (2013-XX-XX)
 --------------------------
 
+### Fixed
+Correctly synchronize if a sub folder is selected (see #5979).
+
 ### Fixed
 Correctly handle password which are longer than 64 characters (see #6015).
 

diff --git a/system/modules/core/library/Contao/Dbafs.php b/system/modules/core/library/Contao/Dbafs.php
@@ -123,6 +123,8 @@ public static function addResource($strResource, $blnUpdateFolders=true)
 			}
 		}
 
+		$objReturn = null;
+
 		// Create the new resources
 		foreach ($arrPaths as $strPath)
 		{
@@ -171,6 +173,12 @@ public static function addResource($strResource, $blnUpdateFolders=true)
 
 				$arrPids[$objFolder->path] = $objModel->id;
 			}
+
+			// Store the model to be returned (see #5979)
+			if ($objModel->path == $strResource)
+			{
+				$objReturn = $objModel;
+			}
 		}
 
 		// Update the folder hashes
@@ -179,8 +187,7 @@ public static function addResource($strResource, $blnUpdateFolders=true)
 			static::updateFolderHashes($arrUpdate);
 		}
 
-		// The last model is the resource itself
-		return $objModel;
+		return $objReturn;
 	}