openrat-cms

commit be425f08c4e5c242cac8ad30c148b04b6d581739
parent 4ce676fd98835bd13a48376edbf8a96c3c24f3d8
Author: Jan Dankert <develop@jandankert.de>
Date:   Thu, 19 Nov 2020 16:15:24 +0100

Fix: $baseObject in addNoticeFor can be null.

Diffstat:
M
modules/cms/action/Action.class.php
 | 
17
+++++++++++++----

1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/modules/cms/action/Action.class.php b/modules/cms/action/Action.class.php
@@ -184,7 +184,7 @@ class Action
 	 * @param string|array $message
 	 */
 	protected function addNoticeFor($baseObject,$key,$vars = array(), $message='') {
-		$this->addNotice(strtolower(ClassUtils::getSimpleClassName($baseObject)), $baseObject->getId(), $baseObject->getName(), $key, Action::NOTICE_OK, $vars, $message);
+		$this->addNoticeInternal($baseObject, $key, Action::NOTICE_OK, $vars, $message);
 	}
 
 	/**
@@ -194,7 +194,7 @@ class Action
 	 * @param string $message
 	 */
 	protected function addInfoFor($baseObject,$key,$vars = array(), $message='') {
-		$this->addNotice(strtolower(ClassUtils::getSimpleClassName($baseObject)), $baseObject->getId(), $baseObject->getName(), $key, Action::NOTICE_INFO, $vars, $message);
+		$this->addNoticeInternal($baseObject, $key, Action::NOTICE_INFO, $vars, $message);
 	}
 
 	/**
@@ -204,7 +204,7 @@ class Action
 	 * @param string $message
 	 */
 	protected function addWarningFor($baseObject,$key,$vars = array(), $message='') {
-		$this->addNotice(strtolower(ClassUtils::getSimpleClassName($baseObject)), $baseObject->getId(), $baseObject->getName(), $key, Action::NOTICE_WARN, $vars, $message);
+		$this->addNoticeInternal($baseObject, $key, Action::NOTICE_WARN, $vars, $message);
 	}
 
 	/**
@@ -214,6 +214,14 @@ class Action
 	 * @param string $message
 	 */
 	protected function addErrorFor($baseObject,$key,$vars = array(), $message='') {
+
+		$this->addNoticeInternal( $baseObject, $key, Action::NOTICE_ERROR, $vars, $message);
+	}
+
+
+
+	private function addNoticeInternal($baseObject,$key,$noticeType,$vars, $message) {
+
 		if	( is_object($baseObject) ) {
 			$type = strtolower(ClassUtils::getSimpleClassName($baseObject));
 			$id   = $baseObject->getId();
@@ -224,9 +232,10 @@ class Action
 			$name = '';
 		}
 
-		$this->addNotice($type,$id,$name, $key, Action::NOTICE_ERROR, $vars, $message);
+		$this->addNotice($type,$id,$name, $key, $noticeType, $vars, $message);
 	}
 
+
 	/**
 	 * F�gt ein Meldung hinzu.
 	 *