--- org/question/backuplib.php	2009-07-29 10:20:22.000000000 +0200
+++ modified/question/backuplib.php	2009-07-31 16:23:09.000000000 +0200
@@ -430,6 +430,15 @@
                                        table_name = 'question'");
     }
     
+	// Called in question_insert_site_file_names only site questions
+	// Hack by Karsten Burger, NET
+    function question_ids_by_backup_site($backup_unique_code) {
+
+        global $CFG;
+
+        return get_records_sql ("SELECT old_id, backup_code FROM {$CFG->prefix}backup_ids, {$CFG->prefix}question, {$CFG->prefix}question_categories, {$CFG->prefix}context WHERE backup_code ='$backup_unique_code' AND table_name = 'question' AND {$CFG->prefix}question.id = {$CFG->prefix}backup_ids.old_id AND {$CFG->prefix}question_categories.id = {$CFG->prefix}question.category AND {$CFG->prefix}context.id = {$CFG->prefix}question_categories.contextid AND {$CFG->prefix}context.contextlevel = 40");
+    }
+
     //Function for inserting question and category ids into db that are all called from
     // quiz_check_backup_mods during execution of backup_check.html 
 
@@ -490,9 +499,14 @@
 
     function question_insert_site_file_names($course, $backup_unique_code){
         global $QTYPES, $CFG;
+		//echo "<br/> Debug: question_insert_sitefile_names called";	//Debug
+		//echo "<br/> Debug: course=$course";	//Debug
+
         $status = true;
-        $questionids = question_ids_by_backup ($backup_unique_code);
+        $questionids = question_ids_by_backup_site($backup_unique_code); // Hack by Karsten Burger
         $urls = array();
+		//echo "<br/> Debug: questionids:";	//Debug
+		//var_dump($questionids);				//Debug
 
         if ($questionids){
             foreach ($questionids as $question_bk){
@@ -502,6 +516,10 @@
             }
         }
         ksort($urls);
+
+		//echo "<br /> Debug urls: ";	//Debug
+		//var_dump($urls);	//Debug
+
         foreach (array_keys($urls) as $url){
             if (file_exists($CFG->dataroot.'/'.SITEID.'/'.$url)){
                 $inserturl = new object();