--- loncom/interface/lonhtmlcommon.pm	2011/01/16 22:45:05	1.287
+++ loncom/interface/lonhtmlcommon.pm	2011/01/18 22:59:06	1.289
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common html routines
 #
-# $Id: lonhtmlcommon.pm,v 1.287 2011/01/16 22:45:05 www Exp $
+# $Id: lonhtmlcommon.pm,v 1.289 2011/01/18 22:59:06 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1429,6 +1429,11 @@ sub htmlareabrowser {
 #
 
 sub show_return_link {
+
+    unless ($env{'request.course.id'}) { return 0; }
+    if ($env{'request.noversionuri'}=~m{^/priv/} ||
+        $env{'request.uri'}=~m{^/~}) { return 1; }
+
     if (($env{'request.noversionuri'} =~ m{^/adm/(viewclasslist|navmaps)($|\?)})
         || ($env{'request.noversionuri'} =~ m{^/adm/.*/aboutme($|\?)})) {
 
@@ -1657,7 +1662,7 @@ returns: nothing
         @html = grep {defined $_ && $_ ne ''} @html;
         for (@html) { 
             s/align="(right|left)"//; 
-            s/<span.*?\/span>// if $category ne 'advtools'; 
+#            s/<span.*?\/span>// if $category ne 'advtools'; 
         } 
 
         push @{$tools{$category}}, @html;