Merge

main/lang/spanish/trad4all.inc.php

@@ -845,4 +845,4 @@ $ToolCourseMaintenance = "Mantenimiento del curso";
 $AreYouSureToDeleteAllDates = "¿Confirma que desea borrar todas las fechas?";
 $AddADateTime = "Añadir fecha";
 $DeleteAllAttendances = "Eliminar todas las asistencias creadas";
-?>
+?>

main/newscorm/learnpath.class.php

@@ -6518,7 +6518,7 @@ class learnpath {
 		$form = new FormValidator('form', 'POST', api_get_self() . "?" . $_SERVER["QUERY_STRING"], '', 'enctype="multipart/form-data"');
 		$defaults["title"] = Security :: remove_XSS(api_convert_encoding($item_title, api_get_system_encoding() ,$this->encoding));
 		if (empty ($item_title)) {
-			$defaults["title"] = Security :: remove_XSS($item_title);
+			$defaults["title"] = Security::remove_XSS($item_title);
 		}
 		$defaults["description"] = api_convert_encoding($item_description, $charset, $this->encoding);
 		$form->addElement('html', $return);

main/newscorm/lp_controller.php

@@ -437,7 +437,7 @@ switch($action)
 
 			if(isset($_POST['submit_button']))
 			{
-				$_SESSION['oLP']->edit_item($_GET['id'], $_POST['parent'], $_POST['previous'], Security::remove_XSS($_POST['title']), $_POST['description']);
+				$_SESSION['oLP']->edit_item($_GET['id'], $_POST['parent'], $_POST['previous'], Security::remove_XSS($_POST['title'], $_POST['description']) );
 
 				$is_success = true;
 			}

tests/main/inc/lib/internationalization.lib.test.php

@@ -521,7 +521,7 @@ class TestInternationalization extends UnitTestCase {
 	public function test_api_ereg() {
 		$pattern = 'scorm/showinframes.php([^"\'&]*)(&|&)file=([^"\'&]*)$';
 		$string = 'http://localhost/dokeos/main/scorm/showinframes.php?id=5&file=test.php';
-		$res = api_ereg($pattern, $string, $regs);
+		$res = api_ereg($pattern, $string);
 		$this->assertTrue(is_numeric($res));
 		$this->assertTrue($res == 45);
 		//var_dump($res);
@@ -541,6 +541,7 @@ class TestInternationalization extends UnitTestCase {
 	public function testapi_eregi() {
 		$pattern = 'scorm/showinframes.php([^"\'&]*)(&|&)file=([^"\'&]*)$';
 		$string = 'http://localhost/dokeos/main/scorm/showinframes.php?id=5&file=test.php';
+		$regs = '';
 		$res = api_eregi($pattern, $string, $regs);
 		$this->assertTrue(is_numeric($res));
 		$this->assertTrue($res == 45);