merging from head so that calculated questions can be imported and ot…

…her improvments

question/editlib.php

@@ -25,7 +25,7 @@
 * @param bool $recurse include subdirectories
 * @author added by Howard Miller June 2004
 */
-function get_questions_category( $category, $noparent=false, $recurse=true ) {
+function get_questions_category( $category, $noparent=false, $recurse=true, $export=true ) {
 
     global $QTYPES;
 
@@ -52,6 +52,7 @@ function get_questions_category( $category, $noparent=false, $recurse=true ) {
         // iterate through questions, getting stuff we need
         foreach($questions as $question) {
             $questiontype = $QTYPES[$question->qtype];
+            $question->export_process = $export;
             $questiontype->get_question_options( $question );
             $qresults[] = $question;
         }

question/format.php

@@ -308,6 +308,11 @@ function defaultquestion() {
         $question->incorrectfeedback = '';
         $question->penalty = 0.1;
 
+        // this option in case the questiontypes class wants
+        // to know where the data came from
+        $question->export_process = true;
+        $question->import_process = true;
+
         return $question;
     }