diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2009-08-24 17:49:31 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2009-08-24 17:49:31 -0400 |
| commit | ab2f6fb8601fa0463c0fedc872a830b9d5283ba4 (patch) | |
| tree | 2cc8d4796414042968aff8b428e8d3bd3de21a98 | |
| parent | add42759c9ae1e8d765fa2098bd12ff8ba4d4eea (diff) | |
| parent | eceffc4c01acd8e07cdb3b0a8591a7e65e5317be (diff) | |
Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | plugins/TemplatePlugin.php | 9 | ||||
| -rw-r--r-- | tpl/index.php | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore index 5394f5eac..1cde3a625 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ avatar/* background/* files/* file/* +local/* _darcs/* logs/* config.php diff --git a/plugins/TemplatePlugin.php b/plugins/TemplatePlugin.php index 03daf6219..6c14f1988 100644 --- a/plugins/TemplatePlugin.php +++ b/plugins/TemplatePlugin.php @@ -198,13 +198,13 @@ class TemplatePlugin extends Plugin { // unless laconica config: // $config['template']['mode'] = 'html'; if (!(common_config('template', 'mode') == 'html')) { - $tpl_file = 'tpl/index.php'; + $tpl_file = $this->templateFolder() . '/index.php'; $tags = array_merge($vars,$this->blocks); include $tpl_file; return; } - $tpl_file = 'tpl/index.html'; + $tpl_file = $this->templateFolder() . '/index.html'; // read the static template $output = file_get_contents( $tpl_file ); @@ -236,6 +236,9 @@ class TemplatePlugin extends Plugin { return true; } + function templateFolder() { + return 'tpl'; + } // catching the StartShowHTML event to halt the rendering function onStartShowHTML( &$act ) { @@ -300,7 +303,7 @@ class TemplateAction extends Action $this->clientError(_('only User #1 can update the template'), $code = 401); // open the old template - $tpl_file = 'tpl/index.html'; + $tpl_file = $this->templateFolder() . '/index.html'; $fp = fopen( $tpl_file, 'w+' ); // overwrite with the new template diff --git a/tpl/index.php b/tpl/index.php index be375e75a..36a161144 100644 --- a/tpl/index.php +++ b/tpl/index.php @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE html> +<?php echo '<?';?>xml version="1.0" encoding="UTF-8"?> <!DOCTYPE html> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> <title><?php echo section('title'); ?></title> |