diff --git a/lib/WebGUI/Widget/Article.pm b/lib/WebGUI/Widget/Article.pm index 239c290f4..66dd0c3e5 100644 --- a/lib/WebGUI/Widget/Article.pm +++ b/lib/WebGUI/Widget/Article.pm @@ -458,8 +458,12 @@ sub www_view { tie %data, 'Tie::CPHash'; %data = getProperties($namespace,$_[0]); if ($data{startDate}time()) { + $output = ""; + if ($data{image} ne "") { # Images collide on successive articles if there is little text - prevent this. + $output .= '
'; + } if ($data{displayTitle} == 1) { - $output = "

".$data{title}."

"; + $output .= "

".$data{title}."

"; } if ($data{image} ne "") { $image = WebGUI::Attachment->new($data{image},$_[0]); @@ -484,6 +488,9 @@ sub www_view { if ($data{attachment} ne "") { $output .= attachmentBox($data{attachment},$_[0]); } + if ($data{image} ne "") { + $output .= "
"; + } } if ($data{processMacros}) { $output = WebGUI::Macro::process($output); @@ -502,8 +509,5 @@ sub www_view { return $output; } - - - 1;