openrat-cms

commit 8d9529d610f33a198596a0808de72e14e1ceaf4c
parent c458c01344392354bea886de0b3c090babdd7638
Author: Jan Dankert <devnull@localhost>
Date:   Wed, 10 Jan 2018 23:36:08 +0100

Action-Klassen nicht einbinden, wenn die Klasse schon definiert wurde. Bei UI-Actions ist dies der Fall.

Diffstat:
modules/cms-core/Dispatcher.class.php
 | 
7
+++++--

1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/modules/cms-core/Dispatcher.class.php b/modules/cms-core/Dispatcher.class.php
@@ -266,8 +266,11 @@ class Dispatcher
         $actionClassName = ucfirst($this->action) . 'Action';
         $actionClassNameWithNamespace = 'cms\\action\\' . $actionClassName;
 
-        // Laden der Action-Klasse.
-        require_once(OR_ACTIONCLASSES_DIR . '/' . $actionClassName . '.class.php');
+        if (!class_exists($actionClassNameWithNamespace))
+        {
+            // Laden der Action-Klasse.
+            require_once(OR_ACTIONCLASSES_DIR . '/' . $actionClassName . '.class.php');
+        }
 
         // Erzeugen der Action-Klasse
         /* @type $do \cms\action\Action */