--- loncom/xml/lonxml.pm	2005/05/28 01:32:33	1.374
+++ loncom/xml/lonxml.pm	2005/06/15 13:06:41	1.376
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # XML Parser Module 
 #
-# $Id: lonxml.pm,v 1.374 2005/05/28 01:32:33 www Exp $
+# $Id: lonxml.pm,v 1.376 2005/06/15 13:06:41 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1065,7 +1065,12 @@ sub parstring {
 
 sub writeallows {
     unless ($#extlinks>=0) { return; }
-    my $thisurl='/res/'.&Apache::lonnet::declutter(shift);
+    my $thisurl = &Apache::lonnet::declutter(shift);
+    if ($thisurl =~ /^uploaded/) {
+        $thisurl = '/'.$thisurl;
+    } else {
+        $thisurl='/res/'.$thisurl;
+    }
     if ($env{'httpref.'.$thisurl}) {
 	$thisurl=$env{'httpref.'.$thisurl};
     }
@@ -1455,8 +1460,6 @@ sub warning {
   
     if ($env{'form.grade_target'} ne 'tex') {
 	if ( &show_error_warn_msg() ) {
-	    my $request=$Apache::lonxml::request;
-	    if (!$request) { $request=Apache->request; }
 	    push(@Apache::lonxml::warning_messages,
 		 $Apache::lonxml::warnings_error_header.
 		 "<b>W</b>ARNING<b>:</b>".join('<br />',@_)."<br />\n");