moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 08:26:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'wip-MDL-40638-master' of git://github.com/abgreeve/moodle

Browse source 
Conflicts:
	version.php
This commit is contained in:
Damyon Wiese 2013-07-16 15:14:49 +08:00
commit 924ea4845a
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/setuplib.php
View file

@ -1165,7 +1165,7 @@ function disable_output_buffering() {
*/ */
function redirect_if_major_upgrade_required() { function redirect_if_major_upgrade_required() {
global $CFG; global $CFG;
$lastmajordbchanges = 2013070400.00; $lastmajordbchanges = 2013071600.00;
if (empty($CFG->version) or (float)$CFG->version < $lastmajordbchanges or if (empty($CFG->version) or (float)$CFG->version < $lastmajordbchanges or
during_initial_install() or !empty($CFG->adminsetuppending)) { during_initial_install() or !empty($CFG->adminsetuppending)) {
try { try {

2
version.php
View file

@ -29,7 +29,7 @@
defined('MOODLE_INTERNAL') || die(); defined('MOODLE_INTERNAL') || die();
$version = 2013071500.02; // YYYYMMDD = weekly release date of this DEV branch $version = 2013071600.00; // YYYYMMDD = weekly release date of this DEV branch
// RR = release increments - 00 in DEV branches // RR = release increments - 00 in DEV branches
// .XX = incremental changes // .XX = incremental changes