Changed the name of the id and show the two icon in question pool CT#462

main/announcements/announcements.php

@@ -211,7 +211,7 @@ $htmlHeadXtra[] = to_javascript();
 $htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.js" type="text/javascript" language="javascript"></script>'; //jQuery
 $htmlHeadXtra[] = '<script type="text/javascript">
 function setFocus(){
-$("#announcement_title").focus();
+$("#emailTitle").focus();
 }
 $(document).ready(function () {
   setFocus();
@@ -1125,7 +1125,7 @@ if ($display_form == true) {
 				</div>
 				<div class="formw">
 
-					<input type="text" id="announcement_title" name="emailTitle" value="'.Security::remove_XSS($title_to_modify).'" size="60">
+					<input type="text" id="emailTitle" name="emailTitle" value="'.Security::remove_XSS($title_to_modify).'" size="60">
 				</div>
 			</div>';
 

main/exercice/question_pool.php

@@ -39,7 +39,7 @@ $language_file='exercice';
 include('exercise.class.php');
 include('question.class.php');
 include('answer.class.php');
-include('../inc/global.inc.php');
+require_once '../inc/global.inc.php';
 
 $this_section=SECTION_COURSES;
 
@@ -267,11 +267,8 @@ if($is_allowedToEdit)
 	
 	<button class="save" type="submit" name="name" value="<?php echo get_lang('Ok') ?>"><?php echo get_lang('Ok') ?></button>
 	<?php
-    if(!empty($fromExercise)) {
-		echo '<a href="admin.php?',api_get_cidreq(),'&exerciseId=',$fromExercise,'">'.Display::return_icon('message_reply_forum.png', get_lang('GoBackToQuestionList')),get_lang('GoBackToQuestionList'),'</a>';
-	} else {
-		echo '<a href="admin.php?',api_get_cidreq(),'&newQuestion=yes">'.Display::return_icon('new_test.gif'),get_lang('NewQu'),'</a>';
-	}
+    echo '<a href="admin.php?',api_get_cidreq(),'&newQuestion=yes">'.Display::return_icon('new_test.gif'),get_lang('NewQu'),'</a>';
+	echo '<a href="admin.php?',api_get_cidreq(),'&exerciseId=',$fromExercise,'">'.Display::return_icon('message_reply_forum.png', get_lang('GoBackToQuestionList')),get_lang('GoBackToQuestionList'),'</a>';	
 	?>
     </form>
 </div>