Merged fixes from MDL-13476

diff --git a/mod/forum/discuss.php b/mod/forum/discuss.php
index ccc96374d80f388c561961b67f510e0f5cb7ae7b..aa88cb0c755fb3c864fc6c12af6f5e3c8b6800b0 100644 (file)
--- a/mod/forum/discuss.php
+++ b/mod/forum/discuss.php
@@ -44,7 +44,7 @@
 
 /// move discussion if requested
     if ($move > 0 and confirm_sesskey()) {
-        $return = $CFG->wwwroot.'/mod/forum/discussion.php?d='.$discussion->id;
+        $return = $CFG->wwwroot.'/mod/forum/discuss.php?d='.$discussion->id;
 
         require_capability('mod/forum:movediscussions', $modcontext);
 
@@ -52,7 +52,7 @@
             error('Cannot move discussion from a simple single discussion forum', $return);
         }
 
-        if ($forumto = get_record('forum', 'id', $move)) {
+        if (!$forumto = get_record('forum', 'id', $move)) {
             error('You can\'t move to that forum - it doesn\'t exist!', $return);
         }