Macros process on one pass.

This commit is contained in:
JT Smith 2003-03-02 17:02:18 +00:00
parent 8e4c8a9fd8
commit 0ebac2be41
22 changed files with 24 additions and 51 deletions

View file

@ -510,7 +510,7 @@ sub www_view {
$var{"list.pageList"} = $p->getPageLinks;
$var{"list.previousPage"} = $p->getPreviousPageLink;
$var{"list.multiplePages"} = ($p->getNumberOfPages > 1);
return $_[0]->processMacros($_[0]->processTemplate($_[0]->get("templateId"),\%var));
return $_[0]->processTemplate($_[0]->get("templateId"),\%var);
}
#-------------------------------------------------------------------
@ -540,14 +540,7 @@ sub www_viewEvent {
$var{"next.label"} = WebGUI::International::get(93,$namespace).'»';
$var{"next.url"} = WebGUI::URL::page("func=viewEvent&wid=".$_[0]->get("wobjectId")."&eid=".$id) if ($id);
$var{description} = $event{description};
return WebGUI::Macro::process(
WebGUI::Template::process(
WebGUI::Template::get(
$_[0]->get("eventTemplateId"),
"EventsCalendar/Event"
),
\%var)
);
return WebGUI::Template::process( WebGUI::Template::get( $_[0]->get("eventTemplateId"), "EventsCalendar/Event"), \%var);
}
1;