fixes relative to templates_c move

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@79 839d8a87-29fc-0310-9880-83ba4fa771e5

diff --git a/Makefile b/Makefile
index fd63c8d..79b6191 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -37,8 +37,8 @@ spool/templates_c spool/uploads spool/wiki.d::
        chmod o+w $@
 
 htdocs/valid.html:
-       touch templates_c/valid.html
-       cd htdocs && ln -sf ../templates_c/valid.html
+       touch spool/templates_c/valid.html
+       cd htdocs && ln -sf ../spool/templates_c/valid.html
 
 htdocs/uploads:
        cd htdocs && ln -sf ../spool/uploads
@@ -46,8 +46,8 @@ htdocs/uploads:
 htdocs/wikipub:
        cd htdocs && ln -sf ../wiki/pub wikipub
 
-wiki/local/pmwiki.config.php:
-       cd wiki/local/     && ln -sf ../../plugins/pmwiki.config.php
+wiki/local/farmconfig.php:
+       cd wiki/local/     && ln -sf ../../plugins/pmwiki.config.php farmconfig.php
 
 wiki/pub/skins/empty:
        cd wiki/pub/skins/ && ln -sf ../../../install.d/wiki/empty
@@ -55,7 +55,7 @@ wiki/pub/skins/empty:
 wiki: get-wiki build-wiki spool/uploads htdocs/uploads htdocs/wikipub
 
 spool/wiki.d::
-       cd $@ && ln -s ../../install.d/wiki/wiki.d/* .
+       cd $@ && ln -sf ../../install.d/wiki/wiki.d/* .
 
 get-wiki:
        @if ! test -d wiki; then                                          \

diff --git a/include/platal/page.inc.php b/include/platal/page.inc.php
index 2aacf3d..aa26ae1 100644 (file)
--- a/include/platal/page.inc.php
+++ b/include/platal/page.inc.php
@@ -45,6 +45,8 @@ class PlatalPage extends DiogenesCorePage
     {
         global $globals;
 
+        $this->DiogenesCorePage();
+
         $this->template_dir  = $globals->spoolroot."/templates/";
         $this->compile_dir   = $globals->spoolroot."/spool/templates_c/";
         array_unshift($this->plugins_dir, $globals->spoolroot."/plugins/");
@@ -61,7 +63,6 @@ class PlatalPage extends DiogenesCorePage
         $this->_tpl       = $tpl;
         $this->_errors    = new XOrgErrors;
 
-        $this->DiogenesCorePage();
         $this->register_prefilter('at_to_globals');
         $this->register_prefilter('trimwhitespace');
         $this->addJsLink('javascript/xorg.js');

diff --git a/include/xorg.mailer.inc.php b/include/xorg.mailer.inc.php
index 08036e2..3a24e0a 100644 (file)
--- a/include/xorg.mailer.inc.php
+++ b/include/xorg.mailer.inc.php
@@ -60,7 +60,7 @@ class XOrgMailer extends Smarty
         $this->compile_check=true;
 
         $this->template_dir = $globals->root . "/templates/";
-        $this->compile_dir  = $globals->root . "/templates_c/";
+        $this->compile_dir  = $globals->root . "/spool/templates_c/";
         $this->config_dir   = $globals->root . "/configs/";
 
         $this->register_outputfilter('mail_format');