[TWiki-Dev] [SVN] r7667 - twiki/branches/DEVELOP/lib/TWiki/UI

[<Cra...@nt...>]

Author: CrawfordCurrie
Date: 2005-11-29 01:02:56 -0800 (Tue, 29 Nov 2005)
New Revision: 7667

Modified:
   twiki/branches/DEVELOP/lib/TWiki/UI/Edit.pm
Log:
Item1069: MAKETEXT not being expanded in template text due to order of template expansion

Modified: twiki/branches/DEVELOP/lib/TWiki/UI/Edit.pm
===================================================================
--- twiki/branches/DEVELOP/lib/TWiki/UI/Edit.pm	2005-11-29 08:32:12 UTC (rev 7666)
+++ twiki/branches/DEVELOP/lib/TWiki/UI/Edit.pm	2005-11-29 09:02:56 UTC (rev 7667)
@@ -318,10 +318,13 @@
         $tmpl =~ s/%FORMFIELDS%/$formText/go;
     } elsif( !$saveCmd && $session->{prefs}->getWebPreferencesValue( 'WEBFORMS', $webName )) {
         my $formText = $session->{templates}->readTemplate( "addform", $session->getSkin() );
+        $formText = $session->handleCommonTags( $formText, $webName, $topic );
+        $formText = $session->{renderer}->getRenderedVersion( $formText, $webName, $topic );
         $tmpl =~ s/%FORMFIELDS%/$formText/go;
     } else {
         $tmpl =~ s/%FORMFIELDS%//go;
     }
+
     $tmpl =~ s/%FORMTEMPLATE%//go; # Clear if not being used
     my $p = $session->{prefs};