tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

BUGFIX Ensure that the DataList is being used correctly when applying filters in HtmlEditorField and Hierarchy

Browse Source
This commit is contained in:
Sean Harvey 2012-06-15 15:49:22 +12:00
parent a9c7c69289
commit 538bcdc74d
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
forms/HtmlEditorField.php
View File

@ -742,8 +742,10 @@ class HtmlEditorField_Toolbar extends RequestHandler {
$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;
}

2
model/Hierarchy.php
View File

@ -591,7 +591,7 @@ class Hierarchy extends DataExtension {
$ids = $stageChildren->column("ID");
if($ids) {
$children->where("\"$baseClass\".\"ID\" NOT IN (" . implode(',',$ids) . ")");
$children = $children->where("\"$baseClass\".\"ID\" NOT IN (" . implode(',',$ids) . ")");
}
}