[TWiki-Dev] CVS: twiki/lib/TWiki Store.pm,1.33,1.34

[John T. <ta...@us...>]

Update of /cvsroot/twiki/twiki/lib/TWiki
In directory usw-pr-cvs1:/tmp/cvs-serv512/lib/TWiki

Modified Files:
	Store.pm 
Log Message:
Make %templateVars init compatible with modPerl, get skin if not supplied to readTemplate.


Index: Store.pm
===================================================================
RCS file: /cvsroot/twiki/twiki/lib/TWiki/Store.pm,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -r1.33 -r1.34
*** Store.pm	2001/07/23 17:01:56	1.33
--- Store.pm	2001/07/26 19:31:39	1.34
***************
*** 34,37 ****
--- 34,41 ----
  use strict;
  
+ # FIXME: Move elsewhere?
+ # template variable hash: (built from %TMPL:DEF{"key"}% ... %TMPL:END%)
+ use vars qw( %templateVars ); # init in TWiki.pm so okay for modPerl
+ 
  # ===========================
  # Normally writes no output, uncomment writeDebug line to get output of all RCS etc command to debug file
***************
*** 1409,1417 ****
  }
  
- # FIXME: Move elsewhere?
- # template variable hash: (built from %TMPL:DEF{"key"}% ... %TMPL:END%)
- use vars qw( %templateVars );
- %templateVars = ();
- 
  # =========================
  sub handleTmplP
--- 1413,1416 ----
***************
*** 1436,1439 ****
--- 1435,1442 ----
  {
      my( $theName, $theSkin ) = @_;
+ 
+     if( ! defined($theSkin) ) {
+         $theSkin = &TWiki::getSkin();
+     }
  
      # recursively read template file(s)