diff --git a/Classes/ViewHelpers/ExtendedIfViewHelper.php b/Classes/ViewHelpers/ExtendedIfViewHelper.php index 30c1812fddcacbb84958730c8eaa2dc585e5b5cd..26d04528ecdefd0184aee399f0a03e954191698f 100644 --- a/Classes/ViewHelpers/ExtendedIfViewHelper.php +++ b/Classes/ViewHelpers/ExtendedIfViewHelper.php @@ -54,17 +54,7 @@ class ExtendedIfViewHelper extends AbstractConditionViewHelper { $condition, $or = FALSE, $or2 = FALSE, $or3 = FALSE, $or4 = FALSE, $and = TRUE, $and2 = TRUE, $and3 = TRUE, $and4 = TRUE, $negate = FALSE ) { - if ($this->evaluateConditionFunctionExists()) { - return parent::render(); - } - - // @todo Remove the following part if only > 7.5 support. - $conditionResult = ($condition || $or || $or2 || $or3 || $or4) && $and && $and2 && $and3 && $and4; - if ($negate ? !$conditionResult : $conditionResult) { - return $this->renderThenChild(); - } else { - return $this->renderElseChild(); - } + return parent::render(); } /** @@ -87,16 +77,6 @@ class ExtendedIfViewHelper extends AbstractConditionViewHelper { return isset($arguments['negate']) && $arguments['negate'] ? !$conditionResult : $conditionResult; } - - /** - * Returns true, if the function evaluateCondition exists in the AbstractConditionViewHelper class. - * - * @deprecated Remove this function if only > 7.5 support. - * @return boolean - */ - protected function evaluateConditionFunctionExists() { - return method_exists('TYPO3\CMS\Fluid\Core\ViewHelper\AbstractConditionViewHelper', 'evaluateCondition'); - } } ?>