L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-69475_310' of https://github.com/stronk7/moodle into MOODLE_310_STABLE

Browse Source
This commit is contained in:
Adrian Greeve
2020-08-17 09:49:54 +08:00
parent a0fc902eb1 ae3af1d860
commit 22ec6995ea
5 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
+1 -1
View File
@@ -212,7 +212,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_310_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`
backup/backup.class.php
+1 -1
View File
@@ -160,7 +160,7 @@ abstract class backup implements checksumable {
/**
* Usually same than major release zero version, mainly for informative/historic purposes.
*/
const RELEASE = '4.0';
const RELEASE = '3.10';
/**
* Cipher to be used in backup and restore operations.
lib/environmentlib.php
+11 -4
View File
@@ -368,7 +368,7 @@ function get_latest_version_available($version, $env_select) {
return false;
}
/// First we look for exact version
if (in_array($version, $versions)) {
if (in_array($version, $versions, true)) {
return $version;
} else {
$found_version = false;
@@ -416,7 +416,7 @@ function get_environment_for_version($version, $env_select) {
}
/// If the version requested is available
if (!in_array($version, $versions)) {
if (!in_array($version, $versions, true)) {
return false;
}
@@ -808,8 +808,15 @@ function environment_check_moodle($version, $env_select) {
$release = get_config('', 'release');
$current_version = normalize_version($release);
if (strpos($release, 'dev') !== false) {
// when final version is required, dev is NOT enough!
$current_version = $current_version - 0.1;
// When final version is required, dev is NOT enough so, at all effects
// it's like we are running the previous version.
$versionarr = explode('.', $current_version);
if (isset($versionarr[1]) and $versionarr[1] > 0) {
$versionarr[1]--;
$current_version = implode('.', $versionarr);
} else {
$current_version = $current_version - 0.1;
}
}
/// And finally compare them, saving results
lib/tests/setuplib_test.php
+1 -1
View File
@@ -43,7 +43,7 @@ class core_setuplib_testcase extends advanced_testcase {
} else {
$docroot = $CFG->docroot;
}
$this->assertRegExp('~^' . preg_quote($docroot, '') . '/\d{2}/' . current_language() . '/course/editing$~',
$this->assertRegExp('~^' . preg_quote($docroot, '') . '/\d{2,3}/' . current_language() . '/course/editing$~',
get_docs_url('course/editing'));
}
version.php
+2 -2
View File
@@ -32,6 +32,6 @@ defined('MOODLE_INTERNAL') || die();
$version = 2020081400.00; // YYYYMMDD = weekly release date of this DEV branch.
// RR = release increments - 00 in DEV branches.
// .XX = incremental changes.
$release = '4.0dev (Build: 20200814)'; // Human-friendly version name
$branch = '40'; // This version's branch.
$release = '3.10dev (Build: 20200814)';// Human-friendly version name
$branch = '310'; // This version's branch.
$maturity = MATURITY_ALPHA; // This version's maturity level.