From: Matthias Schmidt Date: Mon, 17 Oct 2016 18:17:55 +0000 (+0200) Subject: Fix previous commit X-Git-Tag: 3.0.0_Beta_3~22 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=baf85f1daf1ce37597caf8031efca128ee198277;p=GitHub%2FWoltLab%2FWCF.git Fix previous commit --- diff --git a/wcfsetup/install/files/lib/acp/form/BoxEditForm.class.php b/wcfsetup/install/files/lib/acp/form/BoxEditForm.class.php index a86641f185..5af7580e97 100644 --- a/wcfsetup/install/files/lib/acp/form/BoxEditForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/BoxEditForm.class.php @@ -126,7 +126,7 @@ class BoxEditForm extends BoxAddForm { $oldController = new $className; /** @noinspection PhpUndefinedMethodInspection */ - if ($oldController->getConditionDefinition() && (!$this->boxController || (!($this->boxController->getProcessor() instanceof IConditionBoxController)) || !$this->boxController->getProcessor()->getConditionDefinition())) { + if ($oldController instanceof IConditionBoxController && $oldController->getConditionDefinition() && (!$this->boxController || (!($this->boxController->getProcessor() instanceof IConditionBoxController)) || !$this->boxController->getProcessor()->getConditionDefinition())) { ConditionHandler::getInstance()->deleteConditions($oldController->getConditionDefinition(), [$this->box->boxID]); } }