mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
elofgren: Add 2 needed calls to isset(): in Hierarchy::markingFilterMatches() and Notifications::getItems(). Errors were encountered when moving and deleting files in 'Files and Images'. (merged from branches/gsoc)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41775 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
ff2f8fa7f4
commit
9a22699fcc
@ -121,9 +121,8 @@ class Hierarchy extends DataObjectDecorator {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(isset($this->markingFilter['parameter'])) {
|
if(isset($this->markingFilter['parameter']) && $parameterName = $this->markingFilter['parameter']) {
|
||||||
$parameterName = $this->markingFilter['parameter'];
|
if(is_array($this->markingFilter['value'])){
|
||||||
if(is_array($this->markingFilter['value'])) {
|
|
||||||
$ret = false;
|
$ret = false;
|
||||||
foreach($this->markingFilter['value'] as $value) {
|
foreach($this->markingFilter['value'] as $value) {
|
||||||
$ret = $ret||$node->$parameterName==$value;
|
$ret = $ret||$node->$parameterName==$value;
|
||||||
|
Loading…
Reference in New Issue
Block a user