[LON-CAPA-cvs] cvs: loncom /interface lonhtmlcommon.pm

[raeburn]

raeburn		Tue Nov 30 03:06:39 2004 EDT

  Modified files:              
    /loncom/interface	lonhtmlcommon.pm 
  Log:
  Fix bug 3638. Eliminate unintended recursion.       
  
  
Index: loncom/interface/lonhtmlcommon.pm
diff -u loncom/interface/lonhtmlcommon.pm:1.99 loncom/interface/lonhtmlcommon.pm:1.100
--- loncom/interface/lonhtmlcommon.pm:1.99	Tue Nov 23 11:04:33 2004
+++ loncom/interface/lonhtmlcommon.pm	Tue Nov 30 03:06:38 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common html routines
 #
-# $Id: lonhtmlcommon.pm,v 1.99 2004/11/23 16:04:33 matthew Exp $
+# $Id: lonhtmlcommon.pm,v 1.100 2004/11/30 08:06:38 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -899,6 +899,10 @@
     if (! defined($size)) {
         $size = '+2';
     }
+    if ($target) {
+        $target = ' target="'.
+                  &Apache::loncommon::escape_single($target).'"';
+    }
     my $output='';
     unless ($noformat) { $output.='<br /><tt><b>'; }
     $output.='<font size="'.$size.'">'.$prefix.'/';
@@ -913,10 +917,6 @@
 		$linkpath=
                     qq{javascript:$form.action='$linkpath';$form.submit();};
             }
-            if ($target) { 
-                $target = ' target="'.
-                    &Apache::loncommon::escape_single($target).'"';
-            }
 	    $output.=qq{<a href="$linkpath" $target>$dir</a>/};
 	}
     } else {