fix URL if custom template from VFS is used

This commit is contained in:
Ralf Becker 2021-09-03 11:02:06 +02:00
parent 3619bd6ae1
commit ef1239b017

View File

@ -213,7 +213,8 @@ class Template extends Etemplate\Widget
public static function rel2url($path) public static function rel2url($path)
{ {
return $GLOBALS['egw_info']['server']['webserver_url'].'/api/etemplate.php'. return $GLOBALS['egw_info']['server']['webserver_url'].'/api/etemplate.php'.
($path[0] === '/' ? $path : Api\Vfs::parse_url($path, PHP_URL_PATH)).'?'.filemtime(self::rel2path($path)); ($path[0] === '/' ? $path : preg_replace('#^'.self::VFS_TEMPLATE_PATH.'#', '',
Api\Vfs::parse_url($path, PHP_URL_PATH))).'?'.filemtime(self::rel2path($path));
} }
/** /**
@ -285,4 +286,4 @@ if ($GLOBALS['egw_info']['flags']['debug'] == 'etemplate_widget_template')
header('Content-Type: text/xml'); header('Content-Type: text/xml');
echo $template->toXml(); echo $template->toXml();
} }
*/ */