Permalink
Browse files

Backing out fix for bug #4874

  • Loading branch information...
martinlanghoff
martinlanghoff committed Jul 31, 2006
1 parent 4b8df78 commit 0f7fcc83778403b12ca852d824c6e12e8f3f15fa
Showing with 0 additions and 26 deletions.
  1. +0 −2 lang/en_utf8/forum.php
  2. +0 −24 mod/forum/discuss.php
View
@@ -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';
View
@@ -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');

0 comments on commit 0f7fcc8

Please sign in to comment.