Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'MDL-27143_20' of git://github.com/timhunt/moodle into M…

…OODLE_20_STABLE
  • Loading branch information...
commit 4a0b3e2a6214799e885abb85b4df2a3265602d5b 2 parents 1114c49 + 38e32f6
@samhemelryk samhemelryk authored
Showing with 3 additions and 5 deletions.
  1. +2 −4 lib/questionlib.php
  2. +1 −1  question/category_class.php
View
6 lib/questionlib.php
@@ -752,8 +752,7 @@ function question_delete_course_category($category, $newcategory, $feedback=true
/**
* Enter description here...
*
- * @global object
- * @param string $questionids list of questionids
+ * @param array $questionids of question ids
* @param object $newcontext the context to create the saved category in.
* @param string $oldplace a textual description of the think being deleted, e.g. from get_context_name
* @param object $newcategory
@@ -836,8 +835,7 @@ function question_delete_activity($cm, $feedback=true) {
* acutally moving questions and associated data. However, callers of this function also have to
* do other work, which is why you should not call this method directly from outside the questionbank.
*
- * @global object
- * @param string $questionids a comma-separated list of question ids.
+ * @param array $questionids of question ids.
* @param integer $newcategoryid the id of the category to move to.
*/
function question_move_questions_to_category($questionids, $newcategoryid) {
View
2  question/category_class.php
@@ -334,7 +334,7 @@ public function move_questions($oldcat, $newcat){
global $DB;
$questionids = $DB->get_records_select_menu('question',
'category = ? AND (parent = 0 OR parent = id)', array($oldcat), '', 'id,1');
- question_move_questions_to_category($questionids, $newcat);
+ question_move_questions_to_category(array_keys($questionids), $newcat);
}
/**
Please sign in to comment.
Something went wrong with that request. Please try again.