[eGroupWare-cvs] etemplate/inc class.nextmatch_widget.inc.php,1.41,1.42

[<ral...@us...>]

Update of /cvsroot/egroupware/etemplate/inc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29936

Modified Files:
	class.nextmatch_widget.inc.php 
Log Message:
giving the template name in the content precedence over the one supplied in the template

Index: class.nextmatch_widget.inc.php
===================================================================
RCS file: /cvsroot/egroupware/etemplate/inc/class.nextmatch_widget.inc.php,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** class.nextmatch_widget.inc.php	23 Apr 2006 14:43:35 -0000	1.41
--- class.nextmatch_widget.inc.php	30 Apr 2006 07:10:42 -0000	1.42
***************
*** 239,243 ****
  			}
  			list($template,$options) = explode(',',$cell['size']);
! 			if ($template)	// template name can be supplied either in $value['template'] or the options-field
  			{
  				$value['template'] = $template;
--- 239,243 ----
  			}
  			list($template,$options) = explode(',',$cell['size']);
! 			if (!$value['template'] && $template)	// template name can be supplied either in $value['template'] or the options-field
  			{
  				$value['template'] = $template;