Merge "Allow the instconf form element to also use the ANY wildcard help file"

htdocs/lib/mahara.php

@@ -414,6 +414,11 @@ function get_helpfile_location($plugintype, $pluginname, $form, $element, $page=
 
     // if it's a form element, try the wildcard form name
     if (!empty($form) && !empty($element) && $form !== 'ANY') {
+        // if it's a block instance config form element, try the wildcard form name
+        // and element without it's prefixes
+        if (preg_match('/^instconf_/', $element)) {
+            $element = end(explode('_', $element));
+        }
         return get_helpfile_location('core', '', 'ANY', $element, $page, $section);
     }