--- loncom/xml/lonxml.pm	2013/06/05 15:39:34	1.531.2.9
+++ loncom/xml/lonxml.pm	2013/11/20 02:38:26	1.531.2.12
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # XML Parser Module 
 #
-# $Id: lonxml.pm,v 1.531.2.9 2013/06/05 15:39:34 raeburn Exp $
+# $Id: lonxml.pm,v 1.531.2.12 2013/11/20 02:38:26 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -745,7 +745,7 @@ sub init_safespace {
   my ($target,$safeeval,$safehole,$safeinit) = @_;
   $safeeval->reval('use LaTeX::Table;');
   $safeeval->deny_only(':dangerous');
-  $safeeval->reval('use Math::Complex;');
+  $safeeval->reval('use LONCAPA::LCMathComplex;');
   $safeeval->permit_only(":default");
   $safeeval->permit("entereval");
   $safeeval->permit(":base_math");
@@ -1604,7 +1604,7 @@ sub renderingoptions {
 }
 
 sub inserteditinfo {
-      my ($filecontents,$filetype,$filename,$symb,$itemtitle,$folderpath,$uri) = @_;
+      my ($filecontents,$filetype,$filename,$symb,$itemtitle,$folderpath,$uri,$action) = @_;
       $filecontents = &HTML::Entities::encode($filecontents,'<>&"');
       my $xml_help = '';
       my $initialize='';
@@ -1690,7 +1690,7 @@ FULLPAGE
       my $editfooter=(<<ENDFOOTER);
 $initialize
 <a name="editsection" />
-<form $form_events method="post" name="xmledit">
+<form $form_events method="post" name="xmledit" action="$action">
   <div class="LC_edit_problem_editxml_header">
     <table class="LC_edit_problem_header_title"><tr><td>
         $filename
@@ -1714,7 +1714,6 @@ $initialize
     $titledisplay
   </div>
 </form>
-</body>
 ENDFOOTER
       return ($editfooter,$add_to_onload,$add_to_onresize);;
 }
@@ -1928,7 +1927,7 @@ ENDNOTFOUND
     unless ($env{'request.state'} eq 'published') {
 	if ($env{'form.editmode'} && (!($env{'form.viewmode'})) && (!($env{'form.discardview'})))
 	{
-            my ($displayfile,$url,$symb,$itemtitle);
+            my ($displayfile,$url,$symb,$itemtitle,$action);
 	    $displayfile=$request->uri;
             if ($request->uri =~ m{^/uploaded/}) {
                 if ($env{'request.course.id'}) {
@@ -1939,6 +1938,7 @@ ENDNOTFOUND
                         my $filename = $1;
                         if ($1 eq 'loncapa.html') {
                             $displayfile = &mt('Syllabus (minimal template)');
+                            $action = $request->uri.'?forceedit=1';
                         } else {
                             $displayfile = &mt('Syllabus file: [_1]',$1);
                         }
@@ -1957,7 +1957,7 @@ ENDNOTFOUND
 
 	    my ($edit_info, $add_to_onload, $add_to_onresize)=
 		&inserteditinfo($filecontents,$filetype,$displayfile,$symb,
-                                $itemtitle,$env{'form.folderpath'},$request->uri);
+                                $itemtitle,$env{'form.folderpath'},$request->uri,$action);
 
 	    my %options = 
 		('add_entries' =>