FIxed language file location, merged from 1.8 MDL-10920

diff --git a/mod/data/lib.php b/mod/data/lib.php
index d232fc5d57d3f535b4d49a5ec64c83bc32ce4ff5..23c7d6765662658a0e25e3e95cd1aa5f672f8f8f 100755 (executable)
--- a/mod/data/lib.php
+++ b/mod/data/lib.php
@@ -1604,7 +1604,7 @@ function data_convert_to_roles($data, $teacherroles=array(), $studentroles=array
 function data_preset_name($shortname, $path) {
 
     /// We are looking inside the preset itself as a first choice, but also in normal data directory
-    $string = get_string('presetname'.$shortname, 'data', NULL, $path.'/lang/');
+    $string = get_string('modulename', 'datapreset_'.$shortname);
 
     if (substr($string, 0, 1) == '[') {
         return $shortname;