--- loncom/xml/run.pm	2000/10/02 22:20:18	1.7
+++ loncom/xml/run.pm	2000/10/30 20:05:19	1.9
@@ -8,9 +8,9 @@ sub evaluate {
   unless (defined $expression) { return ''; }
   my $result = '';
   $@='';
-  $safeeval->reval('$_=\''.$expression.'\';');
+  $safeeval->reval('$_=q|'.$expression.'|;');
   if ($@ eq '') {
-    $safeeval->reval('{'.$decls.'$_=~s/(\$\{?[A-Za-z]\w*\}?)/(defined(eval($1))?eval($1):$1)/ge;}');
+    $safeeval->reval('{'.$decls.'$_=~s/(\$[A-Za-z]\w*)/(defined(eval($1))?eval($1):$1)/ge;}');
     if ($@ eq '') {
       $result = $safeeval->reval('return $_;');
     } else {