From ec07286647fdf4121f8e3024153903af3bf09a3d Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Sat, 6 Jan 2018 11:58:27 +0100 Subject: [PATCH] Added property regex to ZakFormElementValidatorRegex. --- src/formelementvalidatorregex.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/formelementvalidatorregex.c b/src/formelementvalidatorregex.c index 8614ebf..ddce8a5 100644 --- a/src/formelementvalidatorregex.c +++ b/src/formelementvalidatorregex.c @@ -122,7 +122,14 @@ ZakFormElementValidatorRegex static gboolean zak_form_element_validator_regex_xml_parsing (ZakFormElementValidator *validator, xmlNode *xnode) { - zak_form_element_validator_regex_set_regex (ZAK_FORM_ELEMENT_VALIDATOR_REGEX (validator), (gchar *)xmlNodeGetContent (xnode)); + if (xmlGetProp (xnode, (xmlChar *)"regex") != NULL) + { + zak_form_element_validator_regex_set_regex (ZAK_FORM_ELEMENT_VALIDATOR_REGEX (validator), (gchar *)xmlGetProp (xnode, (xmlChar *)"regex")); + } + else + { + zak_form_element_validator_regex_set_regex (ZAK_FORM_ELEMENT_VALIDATOR_REGEX (validator), (gchar *)xmlNodeGetContent (xnode)); + } return TRUE; } -- 2.49.0