[TWiki-Dev] CVS: twiki/lib TWiki.pm,1.331,1.332

[Walter M. <eth...@us...>]

Update of /cvsroot/twiki/twiki/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv710

Modified Files:
	TWiki.pm 
Log Message:
Render.pm fixes, fix TWiki.pm exports to work with Perl <5.8

Index: TWiki.pm
===================================================================
RCS file: /cvsroot/twiki/twiki/lib/TWiki.pm,v
retrieving revision 1.331
retrieving revision 1.332
diff -C2 -r1.331 -r1.332
*** TWiki.pm	25 Apr 2004 17:18:15 -0000	1.331
--- TWiki.pm	26 Apr 2004 22:27:14 -0000	1.332
***************
*** 53,57 ****
  use Time::Local;	# Added for revDate2EpSecs
  use Cwd qw( cwd ); 	# Added for getTWikiLibDir
- use Exporter qw( import ); # For exporting render flags
  
  require 5.005;		# For regex objects and internationalisation
--- 53,56 ----
***************
*** 137,143 ****
  # and a few other useful constants.
  
! use vars qw(@EXPORT_OK %EXPORT_TAGS);
  
  BEGIN {
      %EXPORT_TAGS = (
  	renderflags => [qw($siteLang $securityFilter $twikiWebname $mainWebname
--- 136,145 ----
  # and a few other useful constants.
  
! use vars qw(@EXPORT_OK %EXPORT_TAGS @ISA);
  
  BEGIN {
+     require Exporter;
+     @ISA = qw(Exporter);
+     
      %EXPORT_TAGS = (
  	renderflags => [qw($siteLang $securityFilter $twikiWebname $mainWebname
***************
*** 3030,3034 ****
      handleInternalTags( $text, $theTopic, $theWeb );
  
!     $text =~ s/%FORMFIELD{(.*?)}%/&getFormField($theWeb,$theTopic,$1)/ge;
      $text =~ s/%TOC{([^}]*)}%/&handleToc($text,$theTopic,$theWeb,$1)/ge;
      $text =~ s/%TOC%/&handleToc($text,$theTopic,$theWeb,"")/ge;
--- 3032,3036 ----
      handleInternalTags( $text, $theTopic, $theWeb );
  
!     $text =~ s/%FORMFIELD{(.*?)}%/&TWiki::Render::getFormField($theWeb,$theTopic,$1)/ge;
      $text =~ s/%TOC{([^}]*)}%/&handleToc($text,$theTopic,$theWeb,$1)/ge;
      $text =~ s/%TOC%/&handleToc($text,$theTopic,$theWeb,"")/ge;