From: <de...@de...> - 2007-09-17 12:13:26
|
Author: CrawfordCurrie Date: 2007-09-17 07:13:26 -0500 (Mon, 17 Sep 2007) New Revision: 14907 Modified: twiki/branches/MAIN/twikiplugins/ActionTrackerPlugin/data/TWiki/ActionTrackerPlugin.txt twiki/branches/MAIN/twikiplugins/ActionTrackerPlugin/lib/TWiki/Plugins/ActionTrackerPlugin/Action.pm Log: Item4648: fix $formfield on 4.1.2 Modified: twiki/branches/MAIN/twikiplugins/ActionTrackerPlugin/data/TWiki/ActionTrackerPlugin.txt =================================================================== --- twiki/branches/MAIN/twikiplugins/ActionTrackerPlugin/data/TWiki/ActionTrackerPlugin.txt 2007-09-17 11:34:36 UTC (rev 14906) +++ twiki/branches/MAIN/twikiplugins/ActionTrackerPlugin/data/TWiki/ActionTrackerPlugin.txt 2007-09-17 12:13:26 UTC (rev 14907) @@ -1,4 +1,3 @@ -%META:TOPICINFO{author="TWikiContributor" date="1121939551" format="1.1" version="$Rev$"}% ---+!! Action Tracker Plugin <!-- @@ -405,6 +404,7 @@ | Plugin Author: | TWiki:Main/CrawfordCurrie, http://c-dot.co.uk | | Plugin Version: | %$VERSION% | | Change History: | | +| 17 Sep 2007 | Bugs:Item4648 $formfield wasn't working on 4.1.2 | | 12 Sep 2007 | Bugs:Item4609 fixed IE cacheing of edit screen - TWiki:Main.JoaquinBuendia | | 9 Sep 2007 | Bugs:Item4427, Bugs:Item4591 add the ability to search for multiple states using a regular expression Bugs:Item4574 fix interaction with !TinyMCEPlugin | | 31 Aug 2007 | Bugs:Item4528 - Support $formfield in ACTIONSEARCH (same semantics as for formatted search) Bugs:Item4529 - Remove link from description of action in the $text field of format. Sponsored by [[http://www.goldstarevents.com][Goldstar Events]]. | Modified: twiki/branches/MAIN/twikiplugins/ActionTrackerPlugin/lib/TWiki/Plugins/ActionTrackerPlugin/Action.pm =================================================================== --- twiki/branches/MAIN/twikiplugins/ActionTrackerPlugin/lib/TWiki/Plugins/ActionTrackerPlugin/Action.pm 2007-09-17 11:34:36 UTC (rev 14906) +++ twiki/branches/MAIN/twikiplugins/ActionTrackerPlugin/lib/TWiki/Plugins/ActionTrackerPlugin/Action.pm 2007-09-17 12:13:26 UTC (rev 14907) @@ -638,15 +638,21 @@ my ( $this, $args, $asHTML ) = @_; my ($meta, $text) = TWiki::Func::readTopic($this->{web}, $this->{topic}); - my $name = $args; - my $breakArgs = ''; - my @params = split( /\,\s*/, $args, 2 ); - if( @params > 1 ) { - $name = $params[0] || ''; - $breakArgs = $params[1] || 1; + + if (!$meta->can('renderFormFieldForDisplay')) { + # 4.1 compatibility + return TWiki::Render::renderFormFieldArg($meta, $args); + } else { + my $name = $args; + my $breakArgs = ''; + my @params = split( /\,\s*/, $args, 2 ); + if( @params > 1 ) { + $name = $params[0] || ''; + $breakArgs = $params[1] || 1; + } + return $meta->renderFormFieldForDisplay( + $name, '$value', { break => $breakArgs, protectdollar => 1 } ); } - return $meta->renderFormFieldForDisplay( - $name, '$value', { break => $breakArgs, protectdollar => 1 } ); } # PRIVATE format the given field (takes precedence over standard |