From 86d1cf45110df5dab16fa5b313c297fad32abc7c Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Mon, 29 Feb 2016 16:49:44 +0000 Subject: [PATCH] Fix label merge Accidentally broken by SVN r54894 --- etemplate/inc/class.bo_merge.inc.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/etemplate/inc/class.bo_merge.inc.php b/etemplate/inc/class.bo_merge.inc.php index 68ad83d97f..e5c48baa2e 100644 --- a/etemplate/inc/class.bo_merge.inc.php +++ b/etemplate/inc/class.bo_merge.inc.php @@ -850,7 +850,14 @@ abstract class bo_merge { $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) {