Skip to content
Permalink
Browse files

MDL-56602 core: Lock themerev during upgrade

This also changes install to use a fixed themerev.
  • Loading branch information...
andrewnicols committed Nov 11, 2016
1 parent f65db49 commit ea10a0319b9d5db90ffbd7b3839bc5dc3fe14687
Showing with 12 additions and 58 deletions.
  1. +10 −0 admin/index.php
  2. +0 −29 lib/moodlelib.php
  3. +2 −7 lib/outputlib.php
  4. +0 −22 lib/tests/moodlelib_test.php
@@ -315,6 +315,11 @@
$testsite = 'behat';
}
if (isset($CFG->themerev)) {
// Store the themerev to restore after purging caches.
$themerev = $CFG->themerev;
}
// We purge all of MUC's caches here.
// Caches are disabled for upgrade by CACHE_DISABLE_ALL so we must set the first arg to true.
// This ensures a real config object is loaded and the stores will be purged.
@@ -324,6 +329,11 @@
// We then purge the regular caches.
purge_all_caches();
if (isset($themerev)) {
// Restore the themerev
set_config('themerev', $themerev);
}
$output = $PAGE->get_renderer('core', 'admin');
if (upgrade_stale_php_files_present()) {
@@ -9620,35 +9620,6 @@ function get_course_display_name_for_list($course) {
}
}
/**
* Convert a Moodle Version formatted number into a guaranteed incrementing timestamp.
*
* @param float $version The version to convert
* @return int The calculated timestamp
*/
function version_to_timestamp($version) {
// Moodle version numbers are in stored in one of the following formats:
// * YYYYMMDDRR.II
// * YYYYMMDDRR
//
// To convert these into a value akin to a Unix Time Stamp, we take the timestamp of the YYYYMMDD component. and add
// a calculation of the RR.II component.
// The hours/minutes/seconds must be specified otherwise the current time is used.
$date = DateTime::createFromFormat('YmdHis', substr($version, 0, 8) . '000000');
$revision = $date->format('U');
// To ensure a unique incrementing timestamp, we multiple the $rr value by a value larger than the max of $ii,
// and then add $ii.
// As a two-digit number, the max value of $ii is 99, so we multiply by 100.
$revision += (100 * (int) substr($version, 8, 2));
// Note: If there is no .II value, or it is 00, then the substr will return false, but be calculated as 0 when cast to int.
$revision += (int) substr($version, 11, 2);
return $revision;
}
/**
* The lang_string class
*
@@ -86,13 +86,8 @@ function theme_get_revision() {
if (empty($CFG->themedesignermode)) {
if (empty($CFG->themerev)) {
// If theme designer mode is not set, and there is no themerev, this is almost certainly part of the installation.
// We attempt to set a themerev based on the Moodle version number to avoid costly rebuilds of the dynamic
// theme files between each page load.
$version = null;
require("{$CFG->dirroot}/version.php");
return version_to_timestamp($version);
// This only happens during install. It doesn't matter what themerev we use as long as it's positive.
return 1;
} else {
return $CFG->themerev;
}
@@ -3282,26 +3282,4 @@ public function data_can_send_from_real_email_address() {
'samecourse' => false, 'result' => false],
];
}
/**
* Unit tests for the version_to_timestamp function.
*/
public function test_version_to_timestamp() {
$baseversion = 2016110100.00;
$basestamp = version_to_timestamp($baseversion);
$this->assertEquals(1477929600, $basestamp);
// Adding 00.99 to the version should increase the timestamp.
$stamp = version_to_timestamp($baseversion + .99);
$this->assertGreaterThan($basestamp, $stamp);
// Adding 01.00 to the base version should increase the stamp higher than the 00.99 version.
$newstamp = version_to_timestamp($baseversion + 01.00);
$this->assertGreaterThan($basestamp, $newstamp);
$this->assertGreaterThan($stamp, $newstamp);
// The previous day's timestamp at it's highest increment should be lower than the base version.
$stamp = version_to_timestamp($baseversion - 00.01);
$this->assertLessThan($basestamp, $stamp);
}
}

0 comments on commit ea10a03

Please sign in to comment.
You can’t perform that action at this time.