diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 8334a436c..d24b2e784 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -11,6 +11,7 @@ - fixed: Images uploaded to a Story should all be the same width so the YUI carousel does not break. - fixed: assets can have urls with /./ or /../ in them, making them inaccessible - fixed: Icons don't show on first view of admin panel in IE + - refixed #10260: WebGUI::Asset::Wobject::Gallery.pm default search date misfunction 7.7.9 - fixed #10266: Public Profile overrides Able to be friend diff --git a/lib/WebGUI/Asset/Wobject/Gallery.pm b/lib/WebGUI/Asset/Wobject/Gallery.pm index 59d787a78..941f74af7 100644 --- a/lib/WebGUI/Asset/Wobject/Gallery.pm +++ b/lib/WebGUI/Asset/Wobject/Gallery.pm @@ -437,12 +437,12 @@ sub appendTemplateVarsSearchForm { $var->{ searchForm_creationDate_after } = WebGUI::Form::dateTime( $session, { name => "creationDate_after", - value => $form->get("creationDate_after") || $oneYearAgo, + value => $form->get("creationDate_after", "dateTime", $oneYearAgo), }); $var->{ searchForm_creationDate_before } = WebGUI::Form::dateTime( $session, { name => "creationDate_before", - value => $form->get("creationDate_before","dateTime"), + value => $form->get("creationDate_before", "dateTime", time()), }); # Buttons @@ -1422,8 +1422,8 @@ sub www_search { } my $oneYearAgo = WebGUI::DateTime->new( $session, time )->add( years => -1 )->epoch; - my $dateAfter = $form->get("creationDate_after") || $oneYearAgo; - my $dateBefore = $form->get("creationDate_before", "dateTime"); + my $dateAfter = $form->get("creationDate_after", "dateTime", $oneYearAgo); + my $dateBefore = $form->get("creationDate_before", "dateTime", time()); my $creationDate = {}; if ($dateAfter) { $creationDate->{start} = $dateAfter; @@ -1451,8 +1451,8 @@ sub www_search { . 'keywords=' . $form->get('keywords') . ';' . 'title=' . $form->get('title') . ';' . 'description=' . $form->get('description') . ';' - . 'creationDate_after=' . $form->get('creationDate_after') . ';' - . 'creationDate_before=' . $form->get('creationDate_before') . ';' + . 'creationDate_after=' . $dateAfter . ';' + . 'creationDate_before=' . $dateBefore . ';' . 'userId=' . $form->get("userId") . ';' ); for my $class ( @$joinClass ) {