openrat-cms

commit fbe4c24301dcc65bfe019960a99627264a46efba
parent 72af030cb11a630b88230e7608e59cc3acabc363
Author: Jan Dankert <develop@jandankert.de>
Date:   Fri, 22 Nov 2019 23:48:22 +0100

New: Using VariableResolver.

Diffstat:
modules/cms-core/model/BaseObject.class.php
 | 
10
+++++-----

1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/modules/cms-core/model/BaseObject.class.php b/modules/cms-core/model/BaseObject.class.php
@@ -6,6 +6,7 @@ namespace cms\model;
 use ArrayUtils;
 use cms\publish\Publish;
 use phpseclib\Math\BigInteger;
+use util\VariableResolver;
 use YAML;
 use template_engine\components\ElseComponent;
 
@@ -1336,14 +1337,13 @@ SQL
     {
         $settings = YAML::parse($this->settings);
 
-        // pass-by-reference
-        array_walk_recursive($settings, function (&$item, $key) {
-            $item = \Text::resolveVariables($item, 'config', function ($var) {
+        $resolver = new VariableResolver();
+
+        // Resolve config variables.
+		$settings = $resolver->resolveVariablesInArray( $settings,'config', function ($var) {
                 global $conf;
                 return ArrayUtils::getSubValue($conf,explode('.',$var) );
             });
-            return $item;
-        });
 
         return $settings;
     }