holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

only check vfs for templates, if /etemplates is mounted

Browse Source
This commit is contained in:
Ralf Becker 2016-10-19 16:44:04 +02:00
parent 50f362c5e3
commit da32666df9
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
api/src/Etemplate/Widget/Template.php
View File

@ -143,6 +143,7 @@ class Template extends Etemplate\Widget
*/
public static function relPath($name, $template_set=null, $version='')
{
static $prefixes = null;
unset($version); // not used currently
list($app, $rest) = explode('.', $name, 2);
@ -153,7 +154,17 @@ class Template extends Etemplate\Widget
$template_path = '/'.$app.'/templates/'.$template_set.'/'.$rest.'.xet';
$default_path = '/'.$app.'/templates/default/'.$rest.'.xet';
foreach(array(Api\Vfs::PREFIX.self::VFS_TEMPLATE_PATH, EGW_SERVER_ROOT) as $prefix)
// check if /etemplates is mounted in VFS and prefer it in that case over phy. file-system
if (!isset($prefixes))
{
$prefixes = array(EGW_SERVER_ROOT);
$fs_tab = Api\Vfs::mount();
if (isset($fs_tab[self::VFS_TEMPLATE_PATH]))
{
array_unshift($prefixes, Api\Vfs::PREFIX.self::VFS_TEMPLATE_PATH);
}
}
foreach($prefixes as $prefix)
{
if (file_exists($prefix.$template_path))
{