[Scoop-checkins] scoop/lib/Scoop/Admin AdminStories.pm

[scoop at lithium.sabren.com]

Update of /cvs/scoop/scoop/lib/Scoop/Admin
In directory lithium.sabren.com:/tmp/cvs-serv17299/lib/Scoop/Admin

Modified Files:
	AdminStories.pm 
Log Message:
Bug 85: adding hulver's patch to let you restrict where and by whom specific
macros may be used.

-janra



Index: AdminStories.pm
===================================================================
RCS file: /cvs/scoop/scoop/lib/Scoop/Admin/AdminStories.pm,v
retrieving revision 1.145
retrieving revision 1.146
diff -C2 -d -r1.145 -r1.146
*** AdminStories.pm	3 Feb 2005 15:48:30 -0000	1.145
--- AdminStories.pm	11 Feb 2005 22:11:04 -0000	1.146
***************
*** 332,337 ****
  
  	if (exists($S->{UI}->{VARS}->{use_macros}) && $S->{UI}->{VARS}->{use_macros}) {
! 		$introtext = $S->process_macros($introtext);
! 		$bodytext = $S->process_macros($bodytext);
  	}
  
--- 332,337 ----
  
  	if (exists($S->{UI}->{VARS}->{use_macros}) && $S->{UI}->{VARS}->{use_macros}) {
! 		$introtext = $S->process_macros($introtext,'intro');
! 		$bodytext = $S->process_macros($bodytext,'body');
  	}
  
***************
*** 387,391 ****
  
  		if (exists($S->{UI}->{VARS}->{use_macros}) && $S->{UI}->{VARS}->{use_macros}) {
! 			$comment = $S->process_macros($comment);
  		}
  
--- 387,392 ----
  
  		if (exists($S->{UI}->{VARS}->{use_macros}) && $S->{UI}->{VARS}->{use_macros}) {
! 			$comment = $S->process_macros($comment,'comment');
! 			$comments->{sig} = $S->process_macros($comments->{sig},'pref');
  		}
  
***************
*** 602,607 ****
  		&& 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);
  	}
  
--- 603,608 ----
  		&& defined($S->{UI}->{VARS}->{macro_render_on_save})
  		&& $S->{UI}->{VARS}->{macro_render_on_save}) {
! 		$introtext = $S->process_macros($introtext,'intro');
! 		$bodytext = $S->process_macros($bodytext,'body');
  	}