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

Fix label merge

Browse Source 
Accidentally broken by SVN r54894
This commit is contained in:
Nathan Gray 2016-02-29 16:49:44 +00:00
parent f3cad0c95f
commit 86d1cf4511
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -850,7 +850,14 @@ abstract class bo_merge
{ {
$content = preg_replace('/\$\$[a-z0-9_\/]+\$\$/i','',$content); $content = preg_replace('/\$\$[a-z0-9_\/]+\$\$/i','',$content);
} }
if ($contentrepeat) fwrite($content_stream, ($n == 0 ? '' : $joiner) . $content); if ($contentrepeat)
{
fwrite($content_stream, ($n == 0 ? '' : $joiner) . $content);
}
if($lableprint)
{
$contentrep[is_array($id) ? implode(':',$id) : $id] = $content;
}
} }
if ($Labelrepeat) if ($Labelrepeat)
{ {