openrat-cms

OpenRat Content Management System
git clone http://git.code.weiherhei.de/openrat-cms.git
Log | Files | Refs

commit 8838e560d8b190e2bda05d4278e6c13cd320d0fc
parent 6037116938e4732b28eadf39463209986b6ab4c0
Author: Jan Dankert <develop@jandankert.de>
Date:   Thu, 10 Sep 2020 23:47:51 +0200

Fix: variables in messages are now resolved correctly.

Diffstat:
modules/cms/base/functions/language.inc.php | 5+----
1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/modules/cms/base/functions/language.inc.php b/modules/cms/base/functions/language.inc.php @@ -44,9 +44,6 @@ function lang( $textVar,$vars = array() ) // Fill in variables if ( $vars ) { - foreach( $vars as $var=>$value ) - $text = str_replace('{'.$var.'}',$value,$text); - $resolver = new VariableResolver(); // Resolve variable @@ -54,7 +51,7 @@ function lang( $textVar,$vars = array() ) return @$vars[$var]; }); - $text = $resolver->parseString( $text ); + $text = $resolver->resolveVariables( $text ); } return $text;