Item611: can't expect TWikiCompat to be installed

git-svn-id: http://svn.foswiki.org/trunk@1674 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
foswiki · Dec 30, 2008 · 3e92237 · 3e92237
1 parent fab37cf
commit 3e92237
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/TWikiCompatibilityPlugin/lib/Foswiki/Plugins/TWikiCompatibilityPlugin.pm b/TWikiCompatibilityPlugin/lib/Foswiki/Plugins/TWikiCompatibilityPlugin.pm
@@ -45,6 +45,10 @@ $pluginName = 'TWikiCompatibilityPlugin';
 
 sub initPlugin {
     my( $topic, $web, $user, $installWeb ) = @_;
+
+    #initialise the augmented template path
+    augmentedTemplatePath();
+
     return 1;
 }
 

diff --git a/core/lib/Foswiki/Templates.pm b/core/lib/Foswiki/Templates.pm
@@ -329,9 +329,11 @@ sub _readTemplateFile {
 
     my @templatePath = split( /\s*,\s*/, $Foswiki::cfg{TemplatePath} );
     if (($Foswiki::cfg{Plugins}{TWikiCompatibilityPlugin}{Enabled})
-        && (lc($name) eq 'foswiki')) {
+        && (lc($name) eq 'foswiki')
+        && defined($Foswiki::cfg{Plugins}{TWikiCompatibilityPlugin}{TemplatePath})
+         ) {
         #TWikiCompatibility, need to test to see if there is a twiki.skin tmpl
-        @templatePath = Foswiki::Plugins::TWikiCompatibilityPlugin::augmentedTemplatePath();
+        @templatePath = @{$Foswiki::cfg{Plugins}{TWikiCompatibilityPlugin}{TemplatePath}};
     }
 
     # Search the $Foswiki::cfg{TemplatePath} for the skinned versions