Merge branch '1.10.x' of github.com:chamilo/chamilo-lms into 1.10.x

main/admin/sub_language.php

@@ -100,14 +100,15 @@ if (!empty($_SESSION['msg'])) {
 	echo '<br />';
 }
 
-$txt_search_word = Security::remove_XSS($_REQUEST['txt_search_word']);
+
+$txt_search_word = (!empty($_REQUEST['txt_search_word']) ? Security::remove_XSS($_REQUEST['txt_search_word']) : '');
 $html ='<div style="float:left" class="actions">';
 $html.='<form style="float:left"  id="Searchlanguage" name="Searchlanguage" method="GET" action="sub_language.php">';
 $html.='&nbsp;'.get_lang('OriginalName').'&nbsp; :&nbsp;';
 
 $html.='<input name="id" type="hidden"  id="id" value="'.Security::remove_XSS($_REQUEST['id']).'" />';
 $html.='<input name="sub_language_id" type="hidden"  id="id" value="'.Security::remove_XSS($_REQUEST['sub_language_id']).'" />';
-$html.='<input name="txt_search_word" type="text" size="50"  id="txt_search_word" value="'.Security::remove_XSS($_REQUEST['txt_search_word']).'" />';
+$html.='<input name="txt_search_word" type="text" size="50"  id="txt_search_word" value="'.$txt_search_word.'" />';
 $html.="&nbsp;".'<button name="SubmitSearchLanguage" class="search" type="submit">'.get_lang('Search').'</button>';
 $html.='</form>';
 $html.='</div>';

main/admin/sub_language_add.php

@@ -226,7 +226,7 @@ if (isset($_POST['SubmitAddNewLanguage'])) {
                                     $msg .= Display::return_message(get_lang('LanguageDirectoryNotWriteableContactAdmin'),'error');
                                 } else {
                                     // Here we build the confirmation message and we send the user to the sub language terms definition page, using a little hack - see #3712
-                                    $_SESSION['msg'] = Display::return_message(get_lang('TheNewSubLanguageHasBeenAdded').$str_info.$link,'confirm',false);
+                                    $_SESSION['msg'] = Display::return_message(get_lang('TheNewSubLanguageHasBeenAdded').$str_info.'confirm',false);
                                     unset($interbreadcrumb);
                                     $_GET['sub_language_id'] = $_REQUEST['sub_language_id'] = $sl_id;
                                     require 'sub_language.php';