openrat-cms

commit 34c0a29baab1357318fcada23a4ae48bd348051d
parent fbe4c24301dcc65bfe019960a99627264a46efba
Author: Jan Dankert <develop@jandankert.de>
Date:   Sat, 23 Nov 2019 00:30:41 +0100

Fix for resolving ${element:...} variables *facepalm*

Diffstat:
modules/cms-core/model/Template.class.php
 | 
2
+-
modules/cms-core/model/Value.class.php
 | 
8
++++----
modules/cms-macros/MacroRunner.class.php
 | 
12
++++++------

3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/modules/cms-core/model/Template.class.php b/modules/cms-core/model/Template.class.php
@@ -254,7 +254,7 @@ SQL
 	/**
  	 * Ermitteln aller Elemente zu diesem Template
  	 * Es wird eine Liste mit den Element-Namen zur?ckgegeben
- 	 * @return Array
+ 	 * @return array
  	 */
 	public function getElementNames()
 	{
diff --git a/modules/cms-core/model/Value.class.php b/modules/cms-core/model/Value.class.php
@@ -1665,16 +1665,16 @@ SQL
 	/**
 	 * Ermittelt den unbearbeiteten, "rohen" Inhalt.
 	 * 
-	 * @return Inhalt
+	 * @return mixed Inhalt
 	 */
 	public function getRawValue()
 	{
-		switch( $this->element->type )
+		switch( $this->element->typeid )
 		{
-			case 'link':
+			case Element::ELEMENT_TYPE_LINK:
 				return $this->linkToObjectId;
 				
-			case 'date';
+			case Element::ELEMENT_TYPE_DATE;
 				return $this->date;
 				
 			default:
diff --git a/modules/cms-macros/MacroRunner.class.php b/modules/cms-macros/MacroRunner.class.php
@@ -37,13 +37,13 @@ class MacroRunner
 
 		$resolver = new VariableResolver();
 
-		$parameters = $resolver->resolveVariablesInArrayWith( $parameter,
+		$parameters = $resolver->resolveVariablesInArrayWith( $parameter, [
 
-			['setting'=> function ($var) {
+			'setting'=> function ($var) {
 				return ArrayUtils::getSubValue($this->page->getSettings(), explode('.', $var));
-			}],
+			},
 
-			['element'=>function ($var) {
+			'element'=>function ($var) {
 				$template = new Template($this->page->templateid);
 				$elements = $template->getElementNames();
 				$elementid = array_search($var, $elements);
@@ -58,8 +58,8 @@ class MacroRunner
 				$value->load();
 
 				return $value->getRawValue();
-			}]
-		);
+			}
+		] );
 
 		foreach ($parameters as $param_name => $param_value) {