Index: questionlib.php
===================================================================
RCS file: /cvsroot/moodle/moodle/lib/questionlib.php,v
retrieving revision 1.241
diff -u -r1.241 questionlib.php
--- questionlib.php	19 Nov 2010 11:02:28 -0000	1.241
+++ questionlib.php	29 Nov 2010 14:34:26 -0000
@@ -847,7 +847,7 @@
             array('id' => $newcategoryid));
     list($questionidcondition, $params) = $DB->get_in_or_equal($questionids);
     $questions = $DB->get_records_sql("
-            SELECT q.id, q.qtype, qc.contextid
+            SELECT q.id, q.qtype,q.category, qc.contextid
               FROM {question} q
               JOIN {question_categories} qc ON q.category = qc.id
              WHERE  q.id $questionidcondition", $params);
@@ -865,6 +865,15 @@
     $DB->set_field_select('question', 'category', $newcategoryid, "parent $questionidcondition", $params);
 
     // TODO Deal with datasets.
+    foreach($questions as $question) {
+        if ($QTYPES[$question->qtype]->has_category_datasets()){
+            if ($newcategoryid != $question->category ) {
+                $question1 = $DB->get_record('question', array('id'=>$question->id));
+                $QTYPES[$question->qtype]->move_category_datasets($question1);
+            }
+        }
+    }
+    
 
     return true;
 }
@@ -1888,29 +1897,29 @@
         $caption = format_string($question->name);
     }
     ?>
-<fieldset class="que comment clearfix">
-    <legend class="ftoggler"><?php echo $caption; ?></legend>
-    <div class="fcontainer clearfix">
-        <div class="fitem">
-            <div class="fitemtitle">
-                <label for="<?php echo $idprefix; ?>_comment_box"><?php print_string('comment', 'quiz'); ?></label>
-            </div>
-            <div class="felement fhtmleditor">
+<fieldset class="que comment clearfix"><legend class="ftoggler"><?php echo $caption; ?></legend>
+<div class="fcontainer clearfix">
+<div class="fitem">
+<div class="fitemtitle"><label
+	for="<?php echo $idprefix; ?>_comment_box"><?php print_string('comment', 'quiz'); ?></label>
+</div>
+<div class="felement fhtmleditor">
                 <?php print_textarea(can_use_html_editor(), 15, 60, 630, 300, $prefix . '[comment]',
                         $state->manualcomment, 0, false, $idprefix . '_comment_box'); ?>
             </div>
-        </div>
-        <div class="fitem">
-            <div class="fitemtitle">
-                <label for="<?php echo $idprefix; ?>_grade_field"><?php print_string('grade', 'quiz'); ?></label>
-            </div>
-            <div class="felement ftext">
-                <input type="text" name="<?php echo $prefix; ?>[grade]" size="<?php echo $fieldsize; ?>" id="<?php echo $idprefix; ?>_grade_field" value="<?php echo $grade; ?>" /> / <?php echo $maxgrade; ?>
+</div>
+<div class="fitem">
+<div class="fitemtitle"><label
+	for="<?php echo $idprefix; ?>_grade_field"><?php print_string('grade', 'quiz'); ?></label>
+</div>
+<div class="felement ftext"><input type="text"
+	name="<?php echo $prefix; ?>[grade]" size="<?php echo $fieldsize; ?>"
+	id="<?php echo $idprefix; ?>_grade_field" value="<?php echo $grade; ?>" /> / <?php echo $maxgrade; ?>
             </div>
-        </div>
-    </div>
+</div>
+</div>
 </fieldset>
-    <?php
+<?php
 }
 
 /**