Moodle release 3.4

.travis.yml

@@ -204,7 +204,7 @@ before_script:
         # We need the official upstream for comparison
         git remote add upstream https://github.com/moodle/moodle.git;
 
-        git fetch upstream master;
+        git fetch upstream MOODLE_34_STABLE;
         export GIT_PREVIOUS_COMMIT="`git merge-base FETCH_HEAD $TRAVIS_COMMIT`";
         export GIT_COMMIT="$TRAVIS_COMMIT";
         export UPSTREAM_FETCH_HEAD=`git rev-parse FETCH_HEAD`

calendar/tests/externallib_test.php

@@ -2266,7 +2266,7 @@ class core_calendar_externallib_testcase extends externallib_advanced_testcase {
         // Admin can load the course.
         $data = external_api::clean_returnvalue(
             core_calendar_external::get_calendar_monthly_view_returns(),
-            core_calendar_external::get_calendar_monthly_view($timestart->format('n'), $timestart->format('Y'),
+            core_calendar_external::get_calendar_monthly_view($timestart->format('Y'), $timestart->format('n'),
                                                               $course->id, null, false)
         );
         $this->assertEquals($data['courseid'], $course->id);
@@ -2274,7 +2274,7 @@ class core_calendar_externallib_testcase extends externallib_advanced_testcase {
         $this->setUser($user1);
         $data = external_api::clean_returnvalue(
             core_calendar_external::get_calendar_monthly_view_returns(),
-            core_calendar_external::get_calendar_monthly_view($timestart->format('n'), $timestart->format('Y'),
+            core_calendar_external::get_calendar_monthly_view($timestart->format('Y'), $timestart->format('n'),
                                                               $course->id, null, false)
         );
         $this->assertEquals($data['courseid'], $course->id);
@@ -2283,7 +2283,7 @@ class core_calendar_externallib_testcase extends externallib_advanced_testcase {
         $this->expectException('require_login_exception');
         $data = external_api::clean_returnvalue(
             core_calendar_external::get_calendar_monthly_view_returns(),
-            core_calendar_external::get_calendar_monthly_view($timestart->format('n'), $timestart->format('Y'),
+            core_calendar_external::get_calendar_monthly_view($timestart->format('Y'), $timestart->format('n'),
                                                               $course->id, null, false)
         );
     }
@@ -2310,7 +2310,7 @@ class core_calendar_externallib_testcase extends externallib_advanced_testcase {
         // Admin can load the course.
         $data = external_api::clean_returnvalue(
             core_calendar_external::get_calendar_day_view_returns(),
-            core_calendar_external::get_calendar_day_view($timestart->format('n'), $timestart->format('Y'),
+            core_calendar_external::get_calendar_day_view($timestart->format('Y'), $timestart->format('n'),
                                                           $timestart->format('j'), $course->id, null)
         );
         $this->assertEquals($data['courseid'], $course->id);
@@ -2318,7 +2318,7 @@ class core_calendar_externallib_testcase extends externallib_advanced_testcase {
         $this->setUser($user1);
         $data = external_api::clean_returnvalue(
             core_calendar_external::get_calendar_day_view_returns(),
-            core_calendar_external::get_calendar_day_view($timestart->format('n'), $timestart->format('Y'),
+            core_calendar_external::get_calendar_day_view($timestart->format('Y'), $timestart->format('n'),
                                                           $timestart->format('j'), $course->id, null)
         );
         $this->assertEquals($data['courseid'], $course->id);
@@ -2327,7 +2327,7 @@ class core_calendar_externallib_testcase extends externallib_advanced_testcase {
         $this->expectException('require_login_exception');
         $data = external_api::clean_returnvalue(
             core_calendar_external::get_calendar_day_view_returns(),
-            core_calendar_external::get_calendar_day_view($timestart->format('n'), $timestart->format('Y'),
+            core_calendar_external::get_calendar_day_view($timestart->format('Y'), $timestart->format('n'),
                                                           $timestart->format('j'), $course->id, null)
         );
     }

install/lang/lt/langconfig.php

@@ -30,6 +30,5 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$string['parentlanguage'] = 'UTF-8';
 $string['thisdirection'] = 'ltr';
 $string['thislanguage'] = 'Lietuvių';

version.php

@@ -29,11 +29,11 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$version  = 2017111000.00;              // YYYYMMDD      = weekly release date of this DEV branch.
+$version  = 2017111300.00;              // 20171113      = branching date YYYYMMDD - do not modify!
                                         //         RR    = release increments - 00 in DEV branches.
                                         //           .XX = incremental changes.
 
-$release  = '3.4rc3 (Build: 20171110)'; // Human-friendly version name
+$release  = '3.4 (Build: 20171113)'; // Human-friendly version name
 
 $branch   = '34';                       // This version's branch.
-$maturity = MATURITY_RC;             // This version's maturity level.
+$maturity = MATURITY_STABLE;             // This version's maturity level.