[system] / branches / gage_dev / webwork2 / lib / WeBWorK / ContentGenerator.pm Repository:
ViewVC logotype

Diff of /branches/gage_dev/webwork2/lib/WeBWorK/ContentGenerator.pm

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 6649 Revision 6650
2012 2012
2013sub parseDateTime { 2013sub parseDateTime {
2014 my ($self, $string, $display_tz) = @_; 2014 my ($self, $string, $display_tz) = @_;
2015 my $ce = $self->r->ce; 2015 my $ce = $self->r->ce;
2016 $display_tz ||= $ce->{siteDefaults}{timezone}; 2016 $display_tz ||= $ce->{siteDefaults}{timezone};
2017 return WeBWorK::Utils::parseDateTime($string, $display_tz); 2017 my $result = eval{ WeBWorK::Utils::parseDateTime($string, $display_tz) }; # trap thrown die and warn messages
2018 my $error_msg = $@ if $@;
2019 return $result unless $error_msg;
2020 $error_msg =~ s|\n|<br/>|g; # format for display in HTML -- replace \n characters with breaks
2021 $self->addbadmessage($error_msg);
2022 return 0; # WeBWorK::Utils::parseDateTime('01/01/1970 at 12:00AM' , 'America/New_York');
2018}; 2023};
2019 2024
2020=item $string = formatDateTime($dateTime, $display_tz) 2025=item $string = formatDateTime($dateTime, $display_tz)
2021 2026
2022Formats the UNIX datetime $dateTime in the standard WeBWorK datetime format. 2027Formats the UNIX datetime $dateTime in the standard WeBWorK datetime format.

Legend:
Removed from v.6649  
changed lines
  Added in v.6650

aubreyja at gmail dot com
ViewVC Help
Powered by ViewVC 1.0.9