Commit 137e155c authored by Nigel McNie's avatar Nigel McNie
Browse files

Look for smarty in htdocs/lib/smarty/libs, which is consistent with upstream...

Look for smarty in htdocs/lib/smarty/libs, which is consistent with upstream (and therefore debian). Look for mahara plugins in a separate directory.

This is so the debian packaging can depend on the smarty package in debian rather than bundling our own.
parent 5b4eb507
......@@ -28,7 +28,7 @@ defined('INTERNAL') || die();
function &smarty_core() {
require_once(get_config('libroot') . 'smarty/Smarty.class.php');
require_once('smarty/libs/Smarty.class.php');
$smarty =& new Smarty();
$theme = theme_setup();
......@@ -38,8 +38,9 @@ function &smarty_core() {
check_dir_exists(get_config('dataroot') . 'smarty/compile/' . $theme->theme);
check_dir_exists(get_config('dataroot') . 'smarty/cache/' . $theme->theme);
$smarty->compile_dir = get_config('dataroot').'smarty/compile/' . $theme->theme;
$smarty->cache_dir = get_config('dataroot').'smarty/cache/' . $theme->theme;
$smarty->compile_dir = get_config('dataroot') . 'smarty/compile/' . $theme->theme;
$smarty->cache_dir = get_config('dataroot') . 'smarty/cache/' . $theme->theme;
$smarty->plugins_dir[] = get_config('libroot') . 'smarty/mahara/';
$smarty->assign('THEMEURL', get_config('themeurl'));
$smarty->assign('WWWROOT', get_config('wwwroot'));
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment