diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 230c7a43a..1d856cd88 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -26,6 +26,7 @@ post containing the login credentials is sent over https. After authentication the user is redirected to http. (Martin Kamerbeek / Procolix) - fix: RSS From Parent assets should always be hidden from navigation + - fix: profile field i18ned possibleValues with apostrophes failing 7.2.3 - fix: minor bug with new template vars in Auth::createAccount diff --git a/lib/WebGUI/Operation/Shared.pm b/lib/WebGUI/Operation/Shared.pm index 371de386b..e761c67a8 100644 --- a/lib/WebGUI/Operation/Shared.pm +++ b/lib/WebGUI/Operation/Shared.pm @@ -109,8 +109,9 @@ sub secureEval { my @param = split (/,\s*/,$2); @param = map { s/^['"]|['"]$//g; $_; } @param; my $output = $trusted{$function}(@param); - return $output if (ref $output); - $code =~ s/\Q$cmd/'$output'/g; + return $output if (ref $output); + $output =~ s/\'/\\\'/g; + $code =~ s/\Q$cmd/\'$output\'/g; } }