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

raeburn lon-capa-cvs@mail.lon-capa.org
Thu, 02 Dec 2004 00:01:35 -0000


raeburn		Wed Dec  1 19:01:35 2004 EDT

  Modified files:              
    /loncom/interface	loncommon.pm lonhtmlcommon.pm 
  Log:
  Guy's preferred solution to issue fixed with lonhtmlcommon v 1.101
  
  
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.237 loncom/interface/loncommon.pm:1.238
--- loncom/interface/loncommon.pm:1.237	Wed Dec  1 18:18:23 2004
+++ loncom/interface/loncommon.pm	Wed Dec  1 19:01:34 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.237 2004/12/01 23:18:23 raeburn Exp $
+# $Id: loncommon.pm,v 1.238 2004/12/02 00:01:34 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -3887,7 +3887,7 @@
 #   Escapes the last element of a full URL.
 sub escape_url {
     my ($url)   = @_;
-    my @urlslices = split(/\//, $url);
+    my @urlslices = split(/\//, $url,-1);
     my $lastitem = &Apache::lonnet::escape(pop(@urlslices));
     return join('/',@urlslices).'/'.$lastitem;
 }
Index: loncom/interface/lonhtmlcommon.pm
diff -u loncom/interface/lonhtmlcommon.pm:1.101 loncom/interface/lonhtmlcommon.pm:1.102
--- loncom/interface/lonhtmlcommon.pm:1.101	Tue Nov 30 13:42:09 2004
+++ loncom/interface/lonhtmlcommon.pm	Wed Dec  1 19:01:34 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common html routines
 #
-# $Id: lonhtmlcommon.pm,v 1.101 2004/11/30 18:42:09 raeburn Exp $
+# $Id: lonhtmlcommon.pm,v 1.102 2004/12/02 00:01:34 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -132,9 +132,6 @@
     foreach (sort keys %recent) {
 	unless ($_=~/^error\:/) {
 	    my $escaped = &Apache::loncommon::escape_url($_);
-            if ($_ =~ /\/$/ && $escaped !~ /\/$/) {
-                $escaped .= '/';
-            }
 	    $return.="\n<option value='$escaped'>".
 		&Apache::lonnet::unescape((split(/\&/,$recent{$_}))[1]).
 		'</option>';