We need to remove the usage of the template directory in includes/init.php and remove...

diff --git a/includes/config.php.new b/includes/config.php.new
index c767accc15424994fe4e6443234d8a37c1bff4c4..3f1a928951b979480015a166bd684d74460dc604 100644 (file)
--- a/includes/config.php.new
+++ b/includes/config.php.new
@@ -52,12 +52,6 @@ $conf['paths']['web'] = '/viewsvn/';
 // is in your shell's path, then you can set this to 'svn'.
 $conf['paths']['svn'] = '/usr/local/bin/svn';
 
-// ###################################################################
-// ///////////////////////// TEMPLATE SET
-// -------------------------------------------------------------------
-// Choose which directory to use in templates/ as the template set.
-$conf['paths']['templateset'] = 'default';
-
 /*=====================================================================*\
 || ###################################################################
 || # $HeadURL$

diff --git a/includes/init.php b/includes/init.php
index 630929500d2a4e71584c7c5faa647b1b3580f1b1..73d6eae321cf853c4fbf91b65d770aa4d459eca8 100644 (file)
--- a/includes/init.php
+++ b/includes/init.php
@@ -52,7 +52,7 @@ BSRegister::Register('input', $input = BSRegister::LoadModule('Input'));
 
 BSRegister::Register('template', $template = BSRegister::LoadModule('Template'));
 
-$template->setTemplateDirectory('./templates/' . $conf['paths']['templateset']);
+$template->setTemplateDirectory('./templates/');
 $template->setExtension('tpl');
 
 // ###################################################################