forms: use get_variadic_url on disabled redirection (#6311)

wcs/forms/root.py

@@ -309,14 +309,9 @@ class FormPage(Directory):
         self.check_role()
         if self.formdef.is_disabled():
             if self.formdef.disabled_redirection:
-                if re.search(r'\[.*\]', self.formdef.disabled_redirection):
-                    try:
-                        variables = get_publisher().substitutions.get_context_variables()
-                        redirect_url = template.process_template(self.formdef.disabled_redirection, variables)
-                        return redirect(redirect_url)
-                    except ezt.EZTException:
-                        pass
-                return redirect(self.formdef.disabled_redirection)
+                url = misc.get_variadic_url(self.formdef.disabled_redirection,
+                        get_publisher().substitutions.get_context_variables())
+                return redirect(url)
             else:
                 raise errors.AccessForbiddenError()
 

wcs/qommon/template.py

@@ -433,12 +433,3 @@ def decorate(body, response):
     fd = StringIO()
     template.generate(fd, vars)
     return fd.getvalue()
-
-
-def process_template(template_ezt, kwargs):
-    template = ezt.Template()
-    template.parse(template_ezt)
-    fd = StringIO()
-    template.generate(fd, kwargs)
-    return htmltext(fd.getvalue())
-