--- websubmit_engine_v1.py	2012-03-15 13:44:54.000000000 +0100
+++ websubmit_engine_v1_hgf.py	2012-03-15 14:06:41.000000000 +0100
@@ -33,6 +33,7 @@
 from cgi import escape
 
 from invenio.config import \
+     CFG_WEBSTYLE_TEMPLATE_SKIN, \
      CFG_SITE_LANG, \
      CFG_SITE_NAME, \
      CFG_SITE_URL, \
@@ -1550,8 +1551,12 @@
                 }
                 if os.path.exists("%s/invenio/websubmit_functions/%s.py" % (CFG_PYLIBDIR, function_name)):
                     # import the function itself
-                    #function = getattr(invenio.websubmit_functions, function_name)
-                    execfile("%s/invenio/websubmit_functions/%s.py" % (CFG_PYLIBDIR, function_name), the_globals)
+                    if os.path.exists("%s/invenio/websubmit_functions/%s_%s.py" % (CFG_PYLIBDIR, function_name,CFG_WEBSTYLE_TEMPLATE_SKIN)):
+                        # execute user-modified invenio websubmit function
+                        execfile("%s/invenio/websubmit_functions/%s_%s.py" % (CFG_PYLIBDIR, function_name, CFG_WEBSTYLE_TEMPLATE_SKIN), the_globals)
+                    else:
+                        # execute default invenio websubmit function
+                        execfile("%s/invenio/websubmit_functions/%s.py" % (CFG_PYLIBDIR, function_name), the_globals)
                     if function_name not in the_globals:
                         currfunction['error'] = 1
                     else: