From: tjhunt <tjhunt>
Date: Thu, 17 Apr 2008 15:59:49 +0000 (+0000)
Subject: MDL-14407
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=767fac29029c6330fa232f3b3a3083301b624317;p=moodle.git

MDL-14407

1. After deleting a question category, it redirects you back to a question bank URL. In some circumstances, this URL will contain a cat=nnn parameter of the category you have just deleted, which naturally leads to an error. This parameter needs to be removed.

2. When there are questions in the category that need to be moved, the category id we are moving to is not exploded on ','.
---

diff --git a/question/category.php b/question/category.php
index 2fc0379b8a..df3c5bb891 100644
--- a/question/category.php
+++ b/question/category.php
@@ -57,7 +57,9 @@
             redirect($thispageurl->out());
         }  elseif ($formdata = $qcobject->moveform->get_data()) {
             /// 'confirm' is the category to move existing questions to
-            $qcobject->move_questions_and_delete_category($formdata->delete, $formdata->category);
+            list($tocategoryid, $tocontextid) = explode(',', $formdata->category);
+            $qcobject->move_questions_and_delete_category($formdata->delete, $tocategoryid);
+            $thispageurl->remove_params('cat');
             redirect($thispageurl->out());
         }
     } else {