From 0f7fcc83778403b12ca852d824c6e12e8f3f15fa Mon Sep 17 00:00:00 2001
From: martinlanghoff <martinlanghoff>
Date: Mon, 31 Jul 2006 05:56:48 +0000
Subject: [PATCH] Backing out fix for bug #4874

---
 lang/en_utf8/forum.php |  2 --
 mod/forum/discuss.php  | 24 ------------------------
 2 files changed, 26 deletions(-)

diff --git a/lang/en_utf8/forum.php b/lang/en_utf8/forum.php
index cafab5a37fd11..9b6184c366edb 100644
--- a/lang/en_utf8/forum.php
+++ b/lang/en_utf8/forum.php
@@ -49,7 +49,6 @@
 $string['disallowsubscribeteacher'] = 'Subscriptions not allowed (except for teachers)';
 $string['discussion'] = 'Discussion';
 $string['discussionmoved'] = 'This discussion has been moved to \'$a\'.';
-$string['discussionmovedpost'] = 'This discussion has been moved to <a href=\"$a->discusshref\">here</a> in the forum <a href=\"$a->forumhref\">$a->forumname</a>';
 $string['discussionname'] = 'Discussion name';
 $string['discussions'] = 'Discussions';
 $string['discussionsstartedby'] = 'Discussions started by $a';
@@ -104,7 +103,6 @@
 $string['modulename'] = 'Forum';
 $string['modulenameplural'] = 'Forums';
 $string['more'] = 'more';
-$string['movedmarker'] = '(Moved)';
 $string['movethisdiscussionto'] = 'Move this discussion to ... ';
 $string['namenews'] = 'News forum';
 $string['namesocial'] = 'Social forum';
diff --git a/mod/forum/discuss.php b/mod/forum/discuss.php
index 7073eb47e5ba5..a422361eb700a 100644
--- a/mod/forum/discuss.php
+++ b/mod/forum/discuss.php
@@ -64,30 +64,6 @@
             $discussion->forum = $forum->id;
             $discussion->timemodified = time();
             
-            // Leave behind a skeleton discussion containing only a post which 
-            // notifies that the discussion has been moved.            
-            $skeleton = clone($discussion);
-            $skeleton->forum = $fromforum->id;
-            $skeleton->name = addslashes( $skeleton->name . ' ' . get_string('movedmarker', 'forum') );
-
-            // Prepare replacement parameters for message content string 
-            // - these create the link to the new discussion location
-            $link = new stdClass;        
-            $me = strip_querystring(me());
-            $link->discusshref = $me . '?d=' . $discussion->id;
-            $link->forumhref = dirname($me) . '/view.php?f=' . $forum->id;
-            $link->forumname = $forum->name;
-
-            // retrieve translateable message content                    
-            $skeleton->intro = addslashes( get_string('discussionmovedpost', 'forum', $link) );
-            $skeleton->format = 1;
-            $skeleton->mailnow = 0;
-
-			// add the skeleton discussion to the database
-            if (!($skeleton->id = forum_add_discussion($skeleton, $msg))) {
-                notify('Failed to add discussion-moved notification : '. $msg);
-            }
-
             if (update_record('forum_discussions', $discussion)) {
                 // Update RSS feeds for both from and to forums.
                 require_once('rsslib.php');