Merge branch 'v6-stable' into v7-stable

2 files changed, 3 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 989a0c9c..2bbfa379 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -170,6 +170,7 @@ Version 6.6.1  [v6-stable] 2012-10-??
 - fix API "glitch" in some plugins
   This did not affect users, but could have caused trouble in the future
   for developers.
+- bugfix: no error msg on invalid field option in legacy/string template
 ---------------------------------------------------------------------------
 Version 6.6.0  [v6-stable] 2012-10-22
 This starts a new stable branch, based on the 6.5.x series, plus:
diff --git a/template.c b/template.c
index e8b95da3..9c24f2a9 100644
--- a/template.c
+++ b/template.c
@@ -731,7 +731,8 @@ static void doOptions(unsigned char **pp, struct templateEntry *pTpe)
 		 } else if(!strcmp((char*)Buf, "mandatory-field")) {
 			 pTpe->data.field.options.bMandatory = 1;
 		 } else {
-			dbgprintf("Invalid field option '%s' specified - ignored.\n", Buf);
+			errmsg.LogError(0, NO_ERRCODE, "template error: invalid field option '%s' "
+				"specified - ignored", Buf);
 		 }
 	}