BUGFIX Ensure that the DataList is being used correctly when applying…

… filters in HtmlEditorField and Hierarchy
silverstripe · Jun 15, 2012 · 538bcdc · 538bcdc
1 parent a9c7c69
commit 538bcdc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/forms/HtmlEditorField.php b/forms/HtmlEditorField.php
@@ -742,8 +742,10 @@ protected function getFiles($parentID = null) {
 		$files = File::get()->where(implode(' OR ', $wheres));
 
 		// Limit by folder (if required)
-		if($parentID) $files->filter('ParentID', $parentID);
+		if($parentID) {
-
+			$files = $files->filter('ParentID', $parentID);
+		}
+
 		return $files;
 	}
 

diff --git a/model/Hierarchy.php b/model/Hierarchy.php
@@ -591,7 +591,7 @@ public function liveChildren($showAll = false, $onlyDeletedFromStage = false) {
 
 			$ids = $stageChildren->column("ID");
 			if($ids) {
-				$children->where("\"$baseClass\".\"ID\" NOT IN (" . implode(',',$ids) . ")");
+				$children = $children->where("\"$baseClass\".\"ID\" NOT IN (" . implode(',',$ids) . ")");
 			}
 		}