Commit info for scoop/lib/Scoop/Admin:
Modified Files:
AdminStories.pm
Log Message:
Macro changes to the core files. -- hulver
Index: AdminStories.pm
===================================================================
RCS file: /cvs/scoop/scoop/lib/Scoop/Admin/AdminStories.pm,v
retrieving revision 1.135
retrieving revision 1.136
diff -r1.135 -r1.136
322a323,334
>
> # if using macros, then render the macro(s) before archiving.
> # Render both introtext and bodytext.
>
> my $introtext = $story->{introtext};
> my $bodytext = $story->{bodytext};
>
> if (exists($S->{UI}->{VARS}->{use_macros}) && $S->{UI}->{VARS}->{use_macros}) {
> $introtext = $S->process_macros($introtext);
> $bodytext = $S->process_macros($bodytext);
> }
>
329,330c341,342
< $S->{DBHARCHIVE}->quote($story->{introtext}),
< $S->{DBHARCHIVE}->quote($story->{bodytext}),
---
> $S->{DBHARCHIVE}->quote($introtext),
> $S->{DBHARCHIVE}->quote($bodytext),
367a380,388
>
> # if using macros, then render the macro(s) before archiving comments.
>
> my $comment = $comments->{comment};
>
> if (exists($S->{UI}->{VARS}->{use_macros}) && $S->{UI}->{VARS}->{use_macros}) {
> $comment = $S->process_macros($comment);
> }
>
374c395
< $S->{DBHARCHIVE}->quote($comments->{comment}),
---
> $S->{DBHARCHIVE}->quote($comment),
576a598,600
> # if using macros, and 'render on save' is on, then render the macro(s) before saving.
> # Render both introtext and bodytext.
>
577a602,610
> my $bodytext = $params{bodytext};
>
> if (exists($S->{UI}->{VARS}->{use_macros}) && $S->{UI}->{VARS}->{use_macros}
> && defined($S->{UI}->{VARS}->{macro_render_on_save})
> && $S->{UI}->{VARS}->{macro_render_on_save}) {
> $introtext = $S->process_macros($introtext);
> $bodytext = $S->process_macros($bodytext);
> }
>
579,580c612,613
<
< my $bodytext = $S->{DBH}->quote($params{bodytext});
---
> $bodytext = $S->{DBH}->quote($bodytext);
>