--- loncom/interface/loncommon.pm 2006/03/24 21:40:11 1.322 +++ loncom/interface/loncommon.pm 2006/04/04 15:11:26 1.325 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common routines # -# $Id: loncommon.pm,v 1.322 2006/03/24 21:40:11 albertel Exp $ +# $Id: loncommon.pm,v 1.325 2006/04/04 15:11:26 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -3007,7 +3007,7 @@ sub headtag { $env{'internal.head.redirect'} = $url; $result.=< - + ADDMETA } if (!defined($title)) { @@ -3015,7 +3015,6 @@ ADDMETA } $result .= ' LON-CAPA '.&mt($title).''.$head_extra; - return $result; } @@ -3052,8 +3051,8 @@ Inputs: $title - optional title for the =cut sub head { - my ($title,$head_extra) = @_; - return &headtag($title,$head_extra).&endheadtag(); + my ($title,$head_extra,$args) = @_; + return &headtag($title,$head_extra,$args).&endheadtag(); } =pod @@ -3094,7 +3093,7 @@ sub start_page { my %head_args; foreach my $arg ('redirect','force_register') { if (defined($args->{$arg})) { - $head_args{$arg} = $args->{$args}; + $head_args{$arg} = $args->{$arg}; } } @@ -3157,9 +3156,10 @@ sub html_encode { sub js_ready { my ($result) = @_; - $result =~ s/[\n\r]/ /g; - $result =~ s/'/\\'/g; - $result =~ s{}{}g; + $result =~ s/[\n\r]/ /xmsg; + $result =~ s/\\/\\\\/xmsg; + $result =~ s/'/\\'/xmsg; + $result =~ s{}{}xmsg; return $result; }