summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Bos <richard@radoeka.nl>2008-03-30 19:44:19 (GMT)
committerRichard Bos <richard@radoeka.nl>2008-03-30 19:44:19 (GMT)
commit9142e82ee2e016d3f95e0053f648007f8d151d48 (patch)
tree38bc1660d5d5f8480b9c979ccbf8a6ecff0be6d3
parentcbbcddba3c1bb59d7656da876c4cf99688fc511c (diff)
downloadkolab-webadmin-9142e82ee2e016d3f95e0053f648007f8d151d48.tar.gz
Make smarty compile location configurable, variable smarty_compiledir
is used for this. See issue2538
-rw-r--r--ChangeLog7
-rw-r--r--Makefile.am2
-rw-r--r--php/admin/include/mysmarty.php.in4
3 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 7375483..fa0e90c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-03-30 Richard Bos <richard@radoeka.nl>
+
+ * php/admin/include/mysmarty.php.in: changed $basedir.'templates into
+ @smarty_compiledir@ (issue2538)
+ * Makefile.am: changed $(phpkolabdir)/templates_c into
+ $(smarty_compiledir) (issue2538)
+
2008-03-28 Richard Bos <richard@radoeka.nl>
* php/admin/templates/systemaliasnagscreen.tpl:
diff --git a/Makefile.am b/Makefile.am
index 930882d..30e178d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -430,5 +430,5 @@ EXTRA_DIST += www/admin/kolab/versions.php.in
install-data-hook:
- $(mkinstalldirs) $(DESTDIR)$(phpkolabdir)/templates_c
+ $(mkinstalldirs) $(DESTDIR)$(smarty_compiledir)
# test -z "$(webserver_usr)" || chown $(webserver_usr) $(DESTDIR)$(phpkolabdir)/templates_c
diff --git a/php/admin/include/mysmarty.php.in b/php/admin/include/mysmarty.php.in
index 0f56940..9762af8 100644
--- a/php/admin/include/mysmarty.php.in
+++ b/php/admin/include/mysmarty.php.in
@@ -35,9 +35,9 @@ class MySmarty extends Smarty {
$this->Smarty();
$basedir = "$php_dir/@kolab_php_module_prefix@admin/";
- $this->template_dir = $basedir.'templates/';
- $this->compile_dir = $basedir.'templates_c/';
$this->config_dir = $basedir.'configs/';
+ $this->template_dir = $basedir.'templates/';
+ $this->compile_dir = '@smarty_compiledir@/';
//$this->cache_dir = $basedir.'cache/';
// Added for i18n management (Romain 05-03-03)
$this->register_function("tr", "translate");