--- loncom/publisher/lonpublisher.pm	2002/05/17 22:08:01	1.81
+++ loncom/publisher/lonpublisher.pm	2002/06/24 14:25:38	1.83
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Publication Handler
 #
-# $Id: lonpublisher.pm,v 1.81 2002/05/17 22:08:01 albertel Exp $
+# $Id: lonpublisher.pm,v 1.83 2002/06/24 14:25:38 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -444,8 +444,7 @@ sub publish {
 	       }
            }
         }
-        $allowstr=~s/\n+/\n/g;
-        $outstring=~s/(\<\/[^\>]+\>\s*)$/$allowstr$1/s;
+        $outstring=~s/\n*(\<\/[^\>]+\>)\s*$/$allowstr\n$1\n/s;
 
 	#Encode any High ASCII characters
 	$outstring=&HTML::Entities::encode($outstring,"\200-\377");
@@ -533,7 +532,7 @@ sub publish {
         my $oldenv=$ENV{'request.uri'};
 
         $ENV{'request.uri'}=$target;
-        $allmeta=Apache::lonxml::xmlparse('meta',$content);
+        $allmeta=Apache::lonxml::xmlparse(undef,'meta',$content);
         $ENV{'request.uri'}=$oldenv;
 
         &metaeval($allmeta);