Fix pieform help on blocktypes within artefacts

Bug #796380

Change-Id: I79d897fd8f5588213f1b9f6e57fee8929068a53a
Signed-off-by: Hugh Davenport <hugh@catalyst.net.nz>

htdocs/lib/mahara.php

@@ -289,7 +289,28 @@ function get_helpfile_location($plugintype, $pluginname, $form, $element, $page=
         return $langfile;
     }
 
-    if ($plugintype != 'core') {
+    if ($plugintype == 'blocktype') { // these are a bit of a special case
+        $bits = explode('/', $pluginname);
+        if (count($bits) == 2) {
+           $location = 'artefact/' . $bits[0] . '/blocktype/' . $bits[1] . '/lang/';
+        }
+        else {
+            try {
+                if ($artefactplugin = blocktype_artefactplugin($pluginname)) {
+                    $location = 'artefact/' . $artefactplugin . '/blocktype/' . $pluginname . '/lang/';
+                }
+                else {
+                    $location = 'blocktype/' . $pluginname . '/lang/';
+                }
+            }
+            catch (SQLException $e) {
+                if (get_config('installed')) {
+                    throw $e;
+                }
+            }
+        }
+    }
+    else if ($plugintype != 'core') {
         $location = $plugintype . '/' . $pluginname . '/lang/';
     }
     else {