diff --git a/src/Plugin/Condition/EntityBundle.php b/src/Plugin/Condition/EntityBundle.php index 77cf2826..13500f68 100644 --- a/src/Plugin/Condition/EntityBundle.php +++ b/src/Plugin/Condition/EntityBundle.php @@ -61,11 +61,11 @@ class EntityBundle extends ConditionPluginBase { if ($context->hasContextValue()) { $entity = $context->getContextValue(); if (!empty($this->configuration['bundles'][$entity->bundle()])) { - return !$this->isNegated(); + return TRUE; } } } - return $this->isNegated(); + return FALSE; } /** diff --git a/src/Plugin/Condition/MediaHasMimetype.php b/src/Plugin/Condition/MediaHasMimetype.php index 3b5e0822..291c0da6 100644 --- a/src/Plugin/Condition/MediaHasMimetype.php +++ b/src/Plugin/Condition/MediaHasMimetype.php @@ -152,7 +152,7 @@ class MediaHasMimetype extends ConditionPluginBase implements ContainerFactoryPl foreach ($media as $medium) { $file = $this->mediaSource->getSourceFile($medium); if (in_array($file->getMimeType(), $mimetypes)) { - return $this->isNegated() ? FALSE : TRUE; + return TRUE; } } } diff --git a/src/Plugin/Condition/NodeHadNamespace.php b/src/Plugin/Condition/NodeHadNamespace.php index 2e8042c8..b1d1efe0 100644 --- a/src/Plugin/Condition/NodeHadNamespace.php +++ b/src/Plugin/Condition/NodeHadNamespace.php @@ -154,12 +154,12 @@ class NodeHadNamespace extends ConditionPluginBase implements ContainerFactoryPl foreach ($registered_namespaces as &$registered_namespace) { $registered_namespace = trim($registered_namespace); if (in_array($namespace, $registered_namespaces)) { - return $this->isNegated() ? FALSE : TRUE; + return TRUE; } } } - return $this->isNegated() ? TRUE : FALSE; + return FALSE; } /** diff --git a/src/Plugin/Condition/NodeHasParent.php b/src/Plugin/Condition/NodeHasParent.php index 8455b233..ca5703ec 100644 --- a/src/Plugin/Condition/NodeHasParent.php +++ b/src/Plugin/Condition/NodeHasParent.php @@ -145,12 +145,13 @@ class NodeHasParent extends ConditionPluginBase implements ContainerFactoryPlugi $nids = $field->getValue(); foreach ($nids as $nid) { if ($nid['target_id'] == $this->configuration['parent_nid']) { - return $this->isNegated() ? FALSE : TRUE; + return TRUE; } } } } } + return FALSE; } /** diff --git a/src/Plugin/Condition/NodeIsPublished.php b/src/Plugin/Condition/NodeIsPublished.php index dcf648ee..1b81270d 100644 --- a/src/Plugin/Condition/NodeIsPublished.php +++ b/src/Plugin/Condition/NodeIsPublished.php @@ -72,11 +72,12 @@ class NodeIsPublished extends ConditionPluginBase implements ContainerFactoryPlu if (!$node && !$this->isNegated()) { return FALSE; } - if ($node->isPublished() && !$this->isNegated()) { - return TRUE; + elseif (!$node) { + return FALSE; + } + else { + return $node->isPublished(); } - - return FALSE; } /**