extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-22 16:03:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

allow multiple space or comma separated template directories

Browse Source
This commit is contained in:
Ralf Becker 2011-06-14 08:54:42 +00:00
parent eb6bea34b2
commit e50565ccb4
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
etemplate/inc/class.bo_merge.inc.php
View File

@ -867,6 +867,12 @@ abstract class bo_merge
{
if (!$dir) return array();
// split multiple comma or whitespace separated directories
// to still allow space or comma in dirnames, we also use the trailing slash of all pathes to split
if (count($dir = preg_split('/[,\s]+\//', $dir)) > 1)
{
foreach($dir as $n => &$d) if ($n) $d = '/'.$d; // re-adding trailing slash removed by split
}
$list = array();
if (($files = egw_vfs::find($dir,array('need_mime'=>true),true)))
{
@ -911,6 +917,12 @@ abstract class bo_merge
);
}
// split multiple comma or whitespace separated directories
// to still allow space or comma in dirnames, we also use the trailing slash of all pathes to split
if ($dir && count($dir = preg_split('/[,\s]+\//', $dir)) > 1)
{
foreach($dir as $n => &$d) if ($n) $d = '/'.$d; // re-adding trailing slash removed by split
}
if ($dir && ($files = egw_vfs::find($dir,array(
'need_mime' => true,
'order' => 'fs_name',