Merge with 532f0cc51e2ceb2c707c0ceb7316562336380916

main/auth/inscription.php

@@ -328,7 +328,7 @@ if (api_get_setting('allow_terms_conditions') == 'true') {
 	}
 	if ($term_preview['type'] == 1) {
 		$form->addElement('checkbox', 'legal_accept', null, get_lang('IHaveReadAndAgree').'&nbsp;<a href="inscription.php?legal" target="_blank">'.get_lang('TermsAndConditions').'</a>');
-		$form->addRule('extra_legal_accept',  get_lang('ThisFieldIsRequired'), 'required');
+		$form->addRule('legal_accept',  get_lang('ThisFieldIsRequired'), 'required');
 	} else {
 		if (!empty($term_preview['content'])) {
 			$preview = LegalManager::show_last_condition($term_preview);

tests/main/gradebook/lib/be/forumthreadlink.class.test.php

@@ -7,9 +7,28 @@ class TestForumThreadLink extends UnitTestCase {
 
 	public function __construct() {
 		// The constructor acts like a global setUp for the class
-		TestManager::create_test_course('COURSEFORUMTHREAD');			
+		TestManager::create_test_course('COURSEFORUMTHREAD');
+		$this->forumthreadlink = new ForumThreadLink();
+		$this->forumthreadlink->set_id(1);
+		$this->forumthreadlink->set_type(5);
+		$this->forumthreadlink->set_ref_id(1);
+		$this->forumthreadlink->set_user_id(1);
+		$this->forumthreadlink->set_course_code('COURSEFORUMTHREAD');
+		$this->forumthreadlink->set_category_id(1);
+		$this->forumthreadlink->set_date(date);
+		$this->forumthreadlink->set_weight(1);
+		$this->forumthreadlink->set_visible('visible');
+		
 	}
 	
+	public function testcalc_score() {
+		$res = $this->forumthreadlink->calc_score(null);
+		$this->assertNull($res);
+		//var_dump($res);
+		$res2 = $this->forumthreadlink->calc_score(1);
+		$this->assertTrue(is_array($res2));
+		//var_dump($res2);
+	}