[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /interface lonwhatsnew.pm
raeburn
raeburn at source.lon-capa.org
Wed Sep 13 19:54:08 EDT 2017
raeburn Wed Sep 13 23:54:08 2017 EDT
Modified files: (Branch: version_2_11_X)
/loncom/interface lonwhatsnew.pm
Log:
- For 2.11
- Backport 1.124, 1.125
Index: loncom/interface/lonwhatsnew.pm
diff -u loncom/interface/lonwhatsnew.pm:1.105.2.14 loncom/interface/lonwhatsnew.pm:1.105.2.15
--- loncom/interface/lonwhatsnew.pm:1.105.2.14 Fri May 19 19:55:09 2017
+++ loncom/interface/lonwhatsnew.pm Wed Sep 13 23:54:07 2017
@@ -1,5 +1,5 @@
#
-# $Id: lonwhatsnew.pm,v 1.105.2.14 2017/05/19 19:55:09 raeburn Exp $
+# $Id: lonwhatsnew.pm,v 1.105.2.15 2017/09/13 23:54:07 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1325,8 +1325,9 @@
if ($emailstatus{$msgid} eq 'new') {
$skipstatus = 1;
}
+ my $esc_msgid = &escape($msgid);
my ($sendtime,$shortsubj,$fromname,$fromdom,$status,$fromcid)=
- &Apache::lonmsg::unpackmsgid($msgid,undef,$skipstatus,undef,
+ &Apache::lonmsg::unpackmsgid($esc_msgid,undef,$skipstatus,undef,
$env{'request.course.id'});
if (($fromcid) && ($fromcid eq $env{'request.course.id'})) {
if (defined($sendtime) && $sendtime!~/error/) {
@@ -1337,7 +1338,7 @@
$shortsubj = &mt('No subject');
}
push(@{$newmsgs}, {
- msgid => $msgid,
+ msgid => $esc_msgid,
sendtime => $sendtime,
shortsub => $shortsubj,
from => $fromname,
@@ -1358,8 +1359,9 @@
my $result = '';
my $critmsgcount = 0;
foreach my $msgid (sort(keys(%what))) {
+ my $esc_msgid = &escape($msgid);
my ($sendtime,$shortsubj,$fromname,$fromdom,$status,$fromcid)=
- &Apache::lonmsg::unpackmsgid($msgid,undef,1,undef,
+ &Apache::lonmsg::unpackmsgid($esc_msgid,undef,1,undef,
$env{'request.course.id'});
if (($fromcid) && ($fromcid eq $env{'request.course.id'})) {
if (defined($sendtime) && $sendtime!~/error/) {
@@ -1369,7 +1371,7 @@
$shortsubj = &mt('No subject');
}
push(@{$critmsgs}, {
- msgid => $msgid,
+ msgid => $esc_msgid,
sendtime => $sendtime,
shortsub => $shortsubj,
from => $fromname,
More information about the LON-CAPA-cvs
mailing list