From 81584e91bb7c86b0592dc83f59581dfcd470eea7 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Mon, 3 Jun 2013 12:45:29 +0200
Subject: [PATCH] Removing $fromExercise value see BT#6262

---
 main/exercice/admin.php                   | 10 ----------
 main/exercice/question.class.php          |  5 -----
 main/exercice/question_admin.inc.php      |  9 ++++++++-
 main/exercice/question_list_admin.inc.php |  4 ++--
 main/exercice/question_pool.php           |  6 +++++-
 5 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/main/exercice/admin.php b/main/exercice/admin.php
index 7d04e0d5e1..ab3883beb4 100644
--- a/main/exercice/admin.php
+++ b/main/exercice/admin.php
@@ -111,9 +111,6 @@ if (empty($clone_question)) {
 if (empty($questionId)) {
     $questionId = isset($_SESSION['questionId'])?$_SESSION['questionId']:0;
 }
-if (empty($modifyExercise)) {
-    $modifyExercise = isset($_GET['modifyExercise'])?$_GET['modifyExercise']:0;
-}
 
 // Cleaning all incomplete attempts of the admin/teacher to avoid weird problems when changing the exercise settings, number of questions, etc
 
@@ -188,13 +185,6 @@ if ($objExercise->fastEdition) {
     $htmlHeadXtra[] = api_get_jqgrid_js();
 }
 
-// Doesn't select the exercise ID if we come from the question pool
-if (!isset($fromExercise) or !$fromExercise) {
-    // gets the right exercise ID, and if 0 creates a new exercise
-    if (!$exerciseId = $objExercise->selectId()) {
-        $modifyExercise = 'yes';
-    }
-}
 $nbrQuestions = $objExercise->getQuestionCount();
 
 // Initializes the Question object
diff --git a/main/exercice/question.class.php b/main/exercice/question.class.php
index a8102481cf..e4f6865b4b 100644
--- a/main/exercice/question.class.php
+++ b/main/exercice/question.class.php
@@ -1570,11 +1570,6 @@ abstract class Question
         $defaults['questionCategory']    = $this->category_list;
         $defaults['parent_id']           = $this->parent_id;
 
-        //Came from he question pool
-        if (isset($_GET['fromExercise'])) {
-            $form->setDefaults($defaults);
-        }
-
         if (!empty($_REQUEST['myid'])) {
             $form->setDefaults($defaults);
         } else {
diff --git a/main/exercice/question_admin.inc.php b/main/exercice/question_admin.inc.php
index 2e3e07b42d..ad7f5e48a3 100644
--- a/main/exercice/question_admin.inc.php
+++ b/main/exercice/question_admin.inc.php
@@ -37,7 +37,14 @@ if (is_object($objQuestion)) {
         $objQuestion->submitText  = get_lang('AddQuestionToExercise');
     }
 
-    if (!isset($_GET['fromExercise'])) {
+    /*if (!isset($_GET['fromExercise'])) {
+        $objQuestion->setDefaultQuestionValues = true;
+    }*/
+
+    // This condition depends of the exercice/question_create.php page that sets the "isContent" value
+    if (isset($_REQUEST['newQuestion']) && $_REQUEST['newQuestion'] == 'yes' &&
+        (isset($_REQUEST['isContent']) && $_REQUEST['isContent'] == '1')
+    ) {
         $objQuestion->setDefaultQuestionValues = true;
     }
 
diff --git a/main/exercice/question_list_admin.inc.php b/main/exercice/question_list_admin.inc.php
index a68df8a710..c6b40c1bcb 100644
--- a/main/exercice/question_list_admin.inc.php
+++ b/main/exercice/question_list_admin.inc.php
@@ -140,7 +140,7 @@ if (!$inATest) {
 
         if (is_array($questionList)) {
 			foreach ($questionList as $id) {
-				//To avoid warning messages
+				// To avoid warning messages
 				if (!is_numeric($id)) {
 					continue;
 				}
@@ -148,7 +148,7 @@ if (!$inATest) {
 				$question_class = get_class($objQuestionTmp);
 
 				$clone_link = '<a href="'.api_get_self().'?'.api_get_cidreq().'&clone_question='.$id.'">'.Display::return_icon('cd.gif',get_lang('Copy'), array(), ICON_SIZE_SMALL).'</a>';
-				$edit_link  = '<a href="'.api_get_self().'?'.api_get_cidreq().'&fromExercise='.$exerciseId.'&type='.$objQuestionTmp->selectType().'&myid=1&editQuestion='.$id.'">'.Display::return_icon('edit.png',get_lang('Modify'), array(), ICON_SIZE_SMALL).'</a>';
+				$edit_link  = '<a href="'.api_get_self().'?'.api_get_cidreq().'&type='.$objQuestionTmp->selectType().'&myid=1&editQuestion='.$id.'">'.Display::return_icon('edit.png',get_lang('Modify'), array(), ICON_SIZE_SMALL).'</a>';
 				if ($objExercise->edit_exercise_in_lp == true) {
 				     $delete_link = '<a id="delete_'.$id.'" class="opener"  href="'.api_get_self().'?'.api_get_cidreq().'&exerciseId='.$exerciseId.'&deleteQuestion='.$id.'" >'.Display::return_icon('delete.png',get_lang('RemoveFromTest'), array(), ICON_SIZE_SMALL).'</a>';
 				}
diff --git a/main/exercice/question_pool.php b/main/exercice/question_pool.php
index 4a854e5e9a..6958d8aacf 100644
--- a/main/exercice/question_pool.php
+++ b/main/exercice/question_pool.php
@@ -1,4 +1,8 @@
 <?php
+
+// A new question pool code was added
+exit;
+
 /* For licensing terms, see /license.txt */
 
 /**
@@ -14,7 +18,7 @@
  * Code
  */
 // name of the language file that needs to be included
-exit;
+
 use \ChamiloSession as Session;
 
 $language_file = 'exercice';