mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-23 07:09:20 +01:00
If the template does not exist in the template dir, it will now load from the default template set.
This commit is contained in:
parent
34b6239bdb
commit
2bcde10643
@ -296,15 +296,34 @@ class Template {
|
|||||||
/* private: filename($filename)
|
/* private: filename($filename)
|
||||||
* filename: name to be completed.
|
* filename: name to be completed.
|
||||||
*/
|
*/
|
||||||
function filename($filename) {
|
function filename($filename,$root='',$time=1) {
|
||||||
|
global $phpgw_info;
|
||||||
|
if($root=='')
|
||||||
|
{
|
||||||
|
$root=$this->root;
|
||||||
|
}
|
||||||
if (substr($filename, 0, 1) != "/") {
|
if (substr($filename, 0, 1) != "/") {
|
||||||
$filename = $this->root."/".$filename;
|
$new_filename = $root.'/'.$filename;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
$new_filename = $filename;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!file_exists($filename))
|
if (!file_exists($new_filename))
|
||||||
$this->halt("filename: file $filename does not exist.");
|
{
|
||||||
|
if($time==2)
|
||||||
return $filename;
|
{
|
||||||
|
$this->halt("filename: file $new_filename does not exist.");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
$new_root = str_replace($phpgw_info['server']['template_set'],'default',$root);
|
||||||
|
$new_filename = $this->filename(str_replace($root.'/','',$new_filename),$new_root,2);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return $new_filename;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* private: varname($varname)
|
/* private: varname($varname)
|
||||||
|
Loading…
Reference in New Issue
Block a user