diff --git a/lang/en_utf8/resource.php b/lang/en_utf8/resource.php
index 25782675b0a03..be1250e779dd4 100644
--- a/lang/en_utf8/resource.php
+++ b/lang/en_utf8/resource.php
@@ -9,6 +9,7 @@
 $string['choose'] = 'Choose';
 $string['chooseafile'] = 'Choose or upload a file';
 $string['chooseparameter'] = 'Choose parameter';
+$string['clicktoopen'] = 'To open this document, click on this link: ';
 $string['configallowlocalfiles'] = 'When creating a new file resource, allow links to files on a local file system such as a CD drive or a hard drive. This may be useful in a classroom where all students have access to a common network drive or where files on a CD need to be accessed. Use of this feature may require changes to your browser\'s security settings.';
 $string['configautofilerenamesettings'] = 'Automatically update references to files and directories when renamed in file manager.';
 $string['configblockdeletingfilesettings'] = 'Block deleting of files and directories referenced by resources. Please note that images and other files referenced from html are not protected.';
diff --git a/mod/data/lib.php b/mod/data/lib.php
index 9df1e1824cc2e..dd625431c0c11 100755
--- a/mod/data/lib.php
+++ b/mod/data/lib.php
@@ -1510,7 +1510,9 @@ function data_user_can_add_entry($data, $currentgroup=false, $groupmode='') {
     } else {
         //else it might be group 0 in visible mode
         if ($groupmode == VISIBLEGROUPS){
-            return (ismember($currentgroup));
+            
+            $result = groups_is_member($currentgroup);
+            return $result;
         } else {
             return true;
         }
diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index 6966e0757b288..1f5275993c88c 100644
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -115,7 +115,7 @@ function forum_add_instance($forum) {
         $discussion->name     = $forum->name;
         $discussion->intro    = $forum->intro;
         $discussion->assessed = $forum->assessed;
-        $discussion->format   = $forum->format;
+        $discussion->format   = $forum->type;
         $discussion->mailnow  = false;
 
         if (! forum_add_discussion($discussion, $discussion->intro)) {