From cb7ffb3a21c9aef74e9171c998bfb427b180a838 Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Mon, 3 Jan 2011 17:59:58 -0800 Subject: [PATCH] Make sure that the StockData asset doesn't die when handling various date formats. Fixes bug #11986. --- docs/changelog/7.x.x.txt | 1 + lib/WebGUI/Asset/Wobject/StockData.pm | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index f4c08cfdc..6b2c20c96 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -16,6 +16,7 @@ - fixed #12015: Thingy: Custom 'File' form fields get deleted upon save - fixed #11994: recurring calendar entries - fixed #11995: recurring calendar entries in trash + - fixed #11986: Finance::Quote can give invalid dates to StockData asset 7.10.6 - fixed #11974: Toolbar icons unclickable in Webkit using HTML5 diff --git a/lib/WebGUI/Asset/Wobject/StockData.pm b/lib/WebGUI/Asset/Wobject/StockData.pm index f41c62290..6f1596d3b 100644 --- a/lib/WebGUI/Asset/Wobject/StockData.pm +++ b/lib/WebGUI/Asset/Wobject/StockData.pm @@ -167,7 +167,8 @@ sub _convertToEpoch { } $hour = $self->_appendZero($hour); $minute = $self->_appendZero($minute); - return $self->session->datetime->humanToEpoch("$year-$month-$day $hour:$minute:00"); + my $epoch = eval {$self->session->datetime->humanToEpoch("$year-$month-$day $hour:$minute:00")}; + return $epoch; } #-------------------------------------------------------------------