MDL-9213 Corrected $forum->format to $forum->type

diff --git a/lang/en_utf8/resource.php b/lang/en_utf8/resource.php
index 7eb8ddfafcd9bde2d4fadb46953a4b0ddef6f570..be1250e779dd4b6c166cb03b5a875766ab035cc0 100644 (file)
--- a/lang/en_utf8/resource.php
+++ b/lang/en_utf8/resource.php
@@ -9,6 +9,7 @@ $string['browserepository'] = 'Browse repository';
 $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.';
@@ -48,6 +49,7 @@ $string['frameifpossible'] = 'Put resource in a frame to keep site navigation vi
 $string['fulltext'] = 'Full text';
 $string['htmlfragment'] = 'HTML fragment';
 $string['imspackageloaded'] = 'Package loaded';
+$string['keepnavigationvisible'] = 'Keep page navigation visible on the same page';
 $string['localfile'] = 'Local file';
 $string['localfilechoose'] = 'Choose a local file (CD-ROM)';
 $string['localfilehelp'] = 'Help displaying local files';

diff --git a/mod/data/lib.php b/mod/data/lib.php
index abb57977bd9700d8f4837caf9ab6debc06dd05d0..60344b2b674ea94fc8fd6c6934918ab59c3cca69 100755 (executable)
--- a/mod/data/lib.php
+++ b/mod/data/lib.php
@@ -1617,7 +1617,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 6966e0757b2887e9ab4a292dfed49762dd7f469b..1f5275993c88cd91154bde685530b99af691247b 100644 (file)
--- 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)) {