When restoring "teacher" forums, if it exists in destinatio course, discussions

are merged mantaining a unique forum (previously, a second "teacher" forum
was created). See bug 880 (http://moodle.org/bugs/bug.php?op=show&bugid=880).

diff --git a/mod/forum/restorelib.php b/mod/forum/restorelib.php
index e6ba310b93fdb2cc797bc18716eb41f58de27469..5ba94f3df57c6238d7316c1db9c71c6e88faeefa 100644 (file)
--- a/mod/forum/restorelib.php
+++ b/mod/forum/restorelib.php
@@ -68,9 +68,23 @@
                     $forum->scale = -($scale->new_id);
                 }
             }
+            
+            $forumtobeinserted = true;
+            //If the forum is a teacher forum, then we have to look if it exists in destination course
+            if ($forum->type == "teacher") {
+                //Look for teacher forum in destination course
+                $teacherforum = get_record("forum","course",$restore->course_id,"type","teacher");
+                if ($teacherforum) {
+                    $newid = $teacherforum->id;
+                    $forumtobeinserted = false;
+                }
+            }
 
-            //The structure is equal to the db, so insert the forum
-            $newid = insert_record ("forum",$forum);
+            //If the forum has to be inserted
+            if ($forumtobeinserted) {
+                //The structure is equal to the db, so insert the forum
+                $newid = insert_record ("forum",$forum);
+            }
 
             //Do some output
             echo "<ul><li>".get_string("modulename","forum")." \"".$forum->name."\"<br>";