OpencachingDeutschland/oc-server3
1
0
Fork 0
Code Issues Pull Requests Releases Activity

resolved merge conflict

Browse Source
This commit is contained in:
following
2013-02-27 03:53:40 +01:00
parent 7383b3fe77 2f54c60359
commit e97c62ffc0
35 changed files with 125 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files
htdocs/lib2/OcSmarty.class.php
+3
View File
@@ -237,6 +237,9 @@ class OcSmarty extends Smarty
$this->bench->stop();
$this->assign('sys_runtime', $this->bench->diff());
$this->assign('screen_css_time',filemtime($opt['rootpath'] . "resource2/" . $opt['template']['style'] . "/css/style_screen.css"));
$this->assign('print_css_time',filemtime($opt['rootpath'] . "resource2/" . $opt['template']['style'] . "/css/style_print.css"));
// check if the template is compiled
// if not, check if translation works correct
$_smarty_compile_path = $this->_get_compile_path($this->name);