Merge remote-tracking branch 'origin/1.11.x' into 1.11.x

Author: AngelFQC

documentation/changelog.html

@@ -216,6 +216,7 @@ <h4>For developers and sysadmins</h4>
             <li>[2024-10-13] (<a href="https://github.com/chamilo/chamilo-lms/commit/5e9f2f0b6c5e7f66eb1a43bb381fb3485e515989">5e9f2f0b</a> - <a href="https://github.com/chamilo/chamilo-lms/issues/4242">GH#4242</a>) Admin: Add configuration setting 'quiz_question_edit_open_advanced_params_by_default' to show questions advanced settings by default</li>
             <li>[2024-10-19] (<a href="https://github.com/chamilo/chamilo-lms/commit/c8748f86f8a409cbd1e1a7195bbcf8ff81a28cae">c8748f86</a> - <a href="https://github.com/chamilo/chamilo-lms/issues/5543">GH#5543</a>) Admin: Add configuration setting 'session_visibility_after_end_date_options_configuration' to limit the visible session-visibility options</li>
             <li>[2024-10-19] (<a href="https://github.com/chamilo/chamilo-lms/commit/4fb383d07b3f313b9e09ca27eccb6eff3034a57a">4fb383d0</a> - <a href="https://github.com/chamilo/chamilo-lms/issues/5191">GH#5191</a>) Admin: Add configuration setting 'hide_my_progress_tab' to hide the 'My Progress' tab</li>
+            <li>[2024-10-21] (<a href="https://github.com/chamilo/chamilo-lms/commit/615a5068a112a40f4649da9626e6e6605436708d">615a5068</a>) Internal: Bump PHP version from 7.2 to 7.4 in composer.json</li>
         </ul>
         <h3>Improvements (minor features) and debug</h3>
         In reverse chronological order...

main/inc/lib/api.lib.php

@@ -917,7 +917,7 @@ function api_get_path($path = '', $configuration = [])
         // Initialization of a table that contains common-purpose paths.
         $paths[$root_web][REL_PATH] = $root_rel;
         $paths[$root_web][REL_COURSE_PATH] = $root_rel.$course_folder;
-        $paths[$root_web][REL_CODE_PATH] = $root_rel.$code_folder;
+        $paths[$root_web][REL_CODE_PATH] = $root_rel.preg_replace('#^/#', '', $code_folder);
         $paths[$root_web][REL_DEFAULT_COURSE_DOCUMENT_PATH] = $paths[$root_web][REL_PATH].'main/default_course_document/';
 
         $paths[$root_web][WEB_PATH] = $slashed_root_web;
@@ -941,7 +941,7 @@ function api_get_path($path = '', $configuration = [])
         $paths[$root_web][WEB_HOME_PATH] = $paths[$root_web][WEB_PATH].$paths[$root_web][REL_HOME_PATH];
 
         $paths[$root_web][SYS_PATH] = $root_sys;
-        $paths[$root_web][SYS_CODE_PATH] = $root_sys.$code_folder;
+        $paths[$root_web][SYS_CODE_PATH] = $root_sys.preg_replace('#^/#', '', $code_folder);
         $paths[$root_web][SYS_TEST_PATH] = $paths[$root_web][SYS_PATH].$paths[$root_web][SYS_TEST_PATH];
         $paths[$root_web][SYS_TEMPLATE_PATH] = $paths[$root_web][SYS_CODE_PATH].$paths[$root_web][SYS_TEMPLATE_PATH];
         $paths[$root_web][SYS_PUBLIC_PATH] = $paths[$root_web][SYS_PATH].$paths[$root_web][SYS_PUBLIC_PATH];

main/survey/survey.lib.php

@@ -58,7 +58,7 @@ public static function generate_unique_code($code)
      */
     public static function checkUniqueCode($surveyCode)
     {
-        if (empty($courseCode)) {
+        if (empty($surveyCode)) {
             return false;
         }
         $courseId = api_get_course_int_id();

tests/behat/features/toolExercise.feature

@@ -106,6 +106,7 @@ Feature: Exercise tool
     And I fill in ckeditor field "option[2]" with "Option B"
     And I fill in select bootstrap static input "#matches_2" select "2"
     And I press "submitQuestion"
+    And wait for the page to be loaded
     Then I should see "Item added"
 
     Scenario: Add question "Open" to exercise created "Exercise 1"
@@ -128,6 +129,7 @@ Feature: Exercise tool
       | questionName | Oral expression question |
       | weighting | 10 |
     And I press "submitQuestion"
+    And wait for the page to be loaded
     Then I should see "Item added"
 
   Scenario: Add question "Exact answers combination" to exercise created "Exercise 1"
@@ -206,6 +208,7 @@ Feature: Exercise tool
     Then I fill in ckeditor field "comment[1]" with "Comment true"
     Then I fill in ckeditor field "comment[2]" with "Comment false"
     And I press "submitQuestion"
+    And wait for the page to be loaded
     Then I should see "Item added"
 
   Scenario: Add question "Global multiple answer" to exercise created "Exercise 1"
@@ -353,7 +356,8 @@ Feature: Exercise tool
     And I press "next"
     Then I should see "Update successful"
     Then I follow "Multiple registration"
-    Then I select "Costea Andrea (acostea)" from "nosessionUsersList[]"
+    Then wait for the page to be loaded
+    Then I select "Andrea Costea (acostea)" from "nosessionUsersList[]"
     And I press "add_user"
     And I press "next"
     Then I should see "Update successful"

tests/behat/features/toolSurvey.feature

@@ -51,6 +51,7 @@ Feature: Survey tool
   Scenario: Duplicate survey
     Given I am on "/main/survey/survey_list.php?cidReq=TEMP"
     And I follow "Duplicate survey"
+    And I press "Copy survey"
     Then I should see "Survey copied"
     And I should see "Survey 1 Copy"