merge

main/exercice/question_create.php

@@ -128,7 +128,7 @@ else
 
 
 <script>
-var ddlObj1=$("#questiontypes").finalselect({id:"test",viewWidth:'260px', viewHeight:'150px',selectText:'<?php echo get_lang('SelectQuestionType')."&nbsp;&nbsp;".Display::return_icon('div_hide',get_lang('Show'),array('style'=>'vertical-align:middle'));?>',selectImage:'<?php echo api_get_path(WEB_IMG_PATH); ?>select.png', viewMouseoverColor: '#EFEFEF'});
+var ddlObj1=$("#questiontypes").finalselect({id:"test",viewWidth:'260px', viewHeight:'150px',selectText:'<?php echo get_lang('SelectQuestionType')."&nbsp;&nbsp;".Display::return_icon('div_hide.gif',get_lang('Show'),array('style'=>'vertical-align:middle'));?>',selectImage:'<?php echo api_get_path(WEB_IMG_PATH); ?>select.png', viewMouseoverColor: '#EFEFEF'});
 $("#test-select").bind('click',function(){
 	$("#question_type_hidden").val(ddlObj1.getText());
 });

main/mySpace/index.php

@@ -211,10 +211,8 @@ if($nb_menu_items>1)
 		}
 	}
 }
-echo '
-		<a href="javascript: void(0);" onclick="javascript: window.print()"><img align="absbottom" src="../img/printmgr.gif">&nbsp;'.get_lang('Print').'</a>
-		<a href="'.api_get_self().'?export=csv&view='.$view.'"><img align="absbottom" src="../img/excel.gif">&nbsp;'.get_lang('ExportAsCSV').'</a>
-';
+echo '<a href="javascript: void(0);" onclick="javascript: window.print()"><img align="absbottom" src="../img/printmgr.gif">&nbsp;'.get_lang('Print').'</a> ';
+echo (isset($_GET['display']) &&  $_GET['display'] == 'useroverview')? '' : '<a href="'.api_get_self().'?export=csv&view='.$view.'"><img align="absbottom" src="../img/excel.gif">&nbsp;'.get_lang('ExportAsCSV').'</a>';
 echo '</div>';
 echo '<h4>'.$title.'</h4>';
 
@@ -1162,7 +1160,7 @@ function display_user_overview_export_options()
 	if ($_GET['export'] == 'options')
 	{
 		// get all the defined extra fields
-		$extrafields = UserManager::get_extra_fields(0,50,5,'ASC');
+		$extrafields = UserManager::get_extra_fields(0,50,5,'ASC', false);
 
 		// creating the form with all the defined extra fields
 		$form = new FormValidator('exportextrafields', 'post', api_get_self()."?view=".Security::remove_XSS($_GET['view']).'&display='.Security::remove_XSS($_GET['display']).'&export='.Security::remove_XSS($_GET['export']));