From 96662a5f59b459553f8276e0a9d71c75ab236445 Mon Sep 17 00:00:00 2001 From: Doug Bell Date: Thu, 15 Jan 2009 20:12:36 +0000 Subject: [PATCH] fixed #4137: Calendar Search page has extra head tags in body --- docs/changelog/7.x.x.txt | 1 + lib/WebGUI/Asset/Wobject/Calendar.pm | 11 +++-------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 47aa82ea1..70bbad4d8 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -7,6 +7,7 @@ - fixed #9507: Navigation: relDepth is calculated with starting point, instead of the first displayed page - fixed a bug where no Payment Gateway labels show up when checking out. - fixed #9511: Subcategories displayed incorrectly + - fixed #4137: Calendar Search page has head tags in body 7.6.8 - added #!/usr/bin/env perl to all utility scripts diff --git a/lib/WebGUI/Asset/Wobject/Calendar.pm b/lib/WebGUI/Asset/Wobject/Calendar.pm index 0bc938b7e..ae5da6a27 100644 --- a/lib/WebGUI/Asset/Wobject/Calendar.pm +++ b/lib/WebGUI/Asset/Wobject/Calendar.pm @@ -2064,14 +2064,9 @@ sub www_search { }); # This is very bad! It should be $self->processStyle or whatnot. - $self->session->http->sendHeader; - my $template = WebGUI::Asset::Template->new($self->session,$self->get("templateIdSearch")); - my $style = $self->session->style->process($self->getSeparator,$self->get("styleTemplateId")); - my ($head, $foot) = split($self->getSeparator,$style); - $self->session->output->print($head, 1); - $self->session->output->print($self->processTemplate($var, undef, $template)); - $self->session->output->print($foot, 1); - return "chunked"; + return $self->processStyle( + $self->processTemplate( $var, $self->get('templateIdSearch') ) + ); } #----------------------------------------------------------------------------