*** 0501release/wiki.pm	Mon May 15 22:26:38 2000
--- 0515prf/wiki.pm	Mon May 15 22:27:12 2000
***************
*** 57,63 ****
  
  # ===========================
  # TWiki version:
! $wikiversion      = "01 May 2000";
  
  # ===========================
  # read the configuration part
--- 57,63 ----
  
  # ===========================
  # TWiki version:
! $wikiversion      = "01 May 2000 patched by PeterFokkinga";
  
  # ===========================
  # read the configuration part
***************
*** 502,509 ****
  # =========================
  sub readTemplate
  {
!     my( $name ) = @_;
!     my $webtmpl = "$templateDir/$webName/$name.tmpl";
      if( -e $webtmpl ) {
          return &readFile( $webtmpl );
      }
--- 502,521 ----
  # =========================
  sub readTemplate
  {
!     my( $name, $topic ) = @_;
!     $topic = "" unless $topic; # prevent 'uninitialized value' warnings
!     
!     my $webtmpl = "$templateDir/$webName/$name.$topic.tmpl";
!     if( -e $webtmpl ) {
!         return &readFile( $webtmpl );
!     }
!     
!     $webtmpl = "$templateDir/$webName/$name.tmpl";
!     if( -e $webtmpl ) {
!         return &readFile( $webtmpl );
!     }
!     
!     $webtmpl = "$templateDir/$name.$topic.tmpl";
      if( -e $webtmpl ) {
          return &readFile( $webtmpl );
      }