class.bo_merge.inc.php

nathangray 2016-02-29 16:49:44 UTC #1

Author: nathangray
New Revision: 55197

URL: http://svn.stylite.de/viewvc/egroupware?rev=55197&view=rev
Log:
Fix label merge

Accidentally broken by SVN r54894

Modified:
trunk/etemplate/inc/class.bo_merge.inc.php

Modified: trunk/etemplate/inc/class.bo_merge.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/etemplate/inc/class.bo_merge.inc.php?rev=55197&r1=55196&r2=55197&view=diff

— trunk/etemplate/inc/class.bo_merge.inc.php (original)
+++ trunk/etemplate/inc/class.bo_merge.inc.php Mon Feb 29 17:49:44 2016
@@ -850,7 +850,14 @@
{
$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)
  {
```

Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=272487151&iu=/4140

eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs