[LON-CAPA-cvs] cvs: loncom(version_2_9_X) /xml lonxml.pm

[raeburn]

raeburn		Thu Aug 13 04:30:57 2009 EDT

  Modified files:              (Branch: version_2_9_X)
    /loncom/xml	lonxml.pm 
  Log:
  - Backport 1.497, 1.498.
  
  
Index: loncom/xml/lonxml.pm
diff -u loncom/xml/lonxml.pm:1.494 loncom/xml/lonxml.pm:1.494.4.1
--- loncom/xml/lonxml.pm:1.494	Fri Apr 17 01:00:20 2009
+++ loncom/xml/lonxml.pm	Thu Aug 13 04:30:56 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # XML Parser Module 
 #
-# $Id: lonxml.pm,v 1.494 2009/04/17 01:00:20 www Exp $
+# $Id: lonxml.pm,v 1.494.4.1 2009/08/13 04:30:56 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -757,6 +757,8 @@
 		  '&maxima_cas_formula_fix');
 
   $safehole->wrap(\&Apache::lonr::r_eval,$safeeval,'&r_eval');
+  $safehole->wrap(\&Apache::lonr::Rentry,$safeeval,'&Rentry');
+  $safehole->wrap(\&Apache::lonr::Rarray,$safeeval,'&Rarray');
   $safehole->wrap(\&Apache::lonr::r_check,$safeeval,'&r_check');
   $safehole->wrap(\&Apache::lonr::r_cas_formula_fix,$safeeval,
                   '&r_cas_formula_fix');
@@ -1041,7 +1043,7 @@
     my ($parstack,$safeeval)=@_;
     my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);
     if ($env{'request.state'} eq 'construct' && $id =~ /([._]|[^\w\d\s[:punct:]])/) {
-	&error(&mt("ID &quot;[_1]&quot; contains invalid characters, IDs are only allowed to contain letters, numbers, spaces and -",'<tt>'.$id.'</tt>'));
+	&error(&mt("ID [_1] contains invalid characters, IDs are only allowed to contain letters, numbers, spaces and -",'<tt>'.$id.'</tt>'));
     }
     if ($id =~ /^\s*$/) { $id = $Apache::lonxml::curdepth; }
     return $id;