From b61151737e62aba29dfa5c82825b0b169b51f38b Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Thu, 13 Dec 2012 15:04:35 +0100
Subject: [PATCH] Fixing error when importing an exercise see #5811

---
 main/coursecopy/classes/CourseRestorer.class.php | 7 ++++---
 main/exercice/exercise.lib.php                   | 2 +-
 main/exercice/overview.php                       | 9 ++++-----
 main/exercice/question.class.php                 | 5 +++--
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/main/coursecopy/classes/CourseRestorer.class.php b/main/coursecopy/classes/CourseRestorer.class.php
index d01c606c0c..a1dbba0cda 100644
--- a/main/coursecopy/classes/CourseRestorer.class.php
+++ b/main/coursecopy/classes/CourseRestorer.class.php
@@ -1098,9 +1098,10 @@ class CourseRestorer
                     $quiz = $quiz->obj;
                 } else {
                     //For backward compatibility
-                    $quiz = $quiz->obj;
+                    //$quiz = $quiz->obj;
+                    $quiz->obj = $quiz;
                 }
-                
+
 				$doc = '';
 				if (strlen($quiz->sound) > 0) {
 					if ($this->course->resources[RESOURCE_DOCUMENT][$quiz->sound]->is_restored()) {
@@ -1157,7 +1158,6 @@ class CourseRestorer
                             $params['session_id'] = $session_id;
     				    }
                     }
-
                     $new_id = Database::insert($table_qui, $params);
 				} else {
 					// $id = -1 identifies the fictionary test for collecting orphan questions. We do not store it in the database.
@@ -1165,6 +1165,7 @@ class CourseRestorer
 				}
 
 				$this->course->resources[RESOURCE_QUIZ][$id]->obj->destination_id = $new_id;
+
 				$order = 0;
 
 				foreach ($quiz->question_ids as $index => $question_id) {
diff --git a/main/exercice/exercise.lib.php b/main/exercice/exercise.lib.php
index 4f30bde0c4..156b077691 100644
--- a/main/exercice/exercise.lib.php
+++ b/main/exercice/exercise.lib.php
@@ -304,7 +304,7 @@ function showQuestion($questionId, $only_questions = false, $origin = false, $cu
                                     $attributes['selected'] = 1;
                                 }
                             }
-                    		$s .= Display::tag('td', Display::input('radio', 'choice['.$questionId.']['.$numAnswer.']', $id, $attributes), array('style'=>'text-align:center'));
+                    		$s .= Display::tag('td', Display::input('radio', 'choice['.$questionId.']['.$numAnswer.']', $id, $attributes), array('style'=>''));
                     	}
                     }
 
diff --git a/main/exercice/overview.php b/main/exercice/overview.php
index 028c9021e5..1fb74a36d5 100644
--- a/main/exercice/overview.php
+++ b/main/exercice/overview.php
@@ -48,13 +48,13 @@ $time_control = false;
 $clock_expired_time = get_session_time_control_key($objExercise->id, $learnpath_id, $learnpath_item_id);
 
 if ($objExercise->expired_time != 0 && !empty($clock_expired_time)) {
-	$time_control = true;    
+	$time_control = true;
 }
 
 if ($time_control) {
     // Get time left for expiring time
     $time_left = api_strtotime($clock_expired_time,'UTC') - time();
-    
+
 	$htmlHeadXtra[] = api_get_css(api_get_path(WEB_LIBRARY_PATH).'javascript/epiclock/stylesheet/jquery.epiclock.css');
     $htmlHeadXtra[] = api_get_css(api_get_path(WEB_LIBRARY_PATH).'javascript/epiclock/renderers/minute/epiclock.minute.css');
     $htmlHeadXtra[] = api_get_js('epiclock/javascript/jquery.dateformat.min.js');
@@ -174,7 +174,7 @@ if (!empty($attempts)) {
 		case EXERCISE_FEEDBACK_TYPE_EXAM:
 			$header_names = array(get_lang('Attempt'), get_lang('StartDate'), get_lang('Score'));
 			break;
-	}	
+	}
 	$column = 0;
 	foreach ($header_names as $item) {
 		$table->setHeaderContents(0, $column, $item);
@@ -185,7 +185,6 @@ if (!empty($attempts)) {
 		foreach ($my_attempt_array as $data) {
 			$column = 0;
 			$table->setCellContents($row, $column, $data);
-			//$table->setRowAttributes($row, 'style="text-align:center"');
 			$class = 'class="row_odd"';
 			if($row % 2) {
 				$class = 'class="row_even"';
@@ -215,7 +214,7 @@ if ($objExercise->selectAttempts()) {
 	//$options.= $attempt_message; //Display::div($attempt_message, array('class'=>"offset2 span2"));
 }
 
-if ($time_control) {	
+if ($time_control) {
     $html.= $objExercise->return_time_left_div();
 }
 
diff --git a/main/exercice/question.class.php b/main/exercice/question.class.php
index 835b7344ba..a53c524346 100644
--- a/main/exercice/question.class.php
+++ b/main/exercice/question.class.php
@@ -1245,8 +1245,8 @@ abstract class Question
             $form->addElement('select', 'questionCategory', get_lang('Category'), $tabCat);
 
             //Medias
-            $course_medias = Question::prepare_course_media_select(api_get_course_int_id());
-            $form->addElement('select', 'parent_id', get_lang('AttachToMedia'), $course_medias);
+            //$course_medias = Question::prepare_course_media_select(api_get_course_int_id());
+            //$form->addElement('select', 'parent_id', get_lang('AttachToMedia'), $course_medias);
 
             $form->addElement('html','</div>');
         }
@@ -1534,6 +1534,7 @@ abstract class Question
 			eval('$explanation = get_lang('.$tabQuestionList[$type][1].'::$explanationLangVar);');
 			return array($img, $explanation);
     }
+
     /**
      * Get course medias
      * @param int course id