mirror of
https://github.com/moodle/moodle.git
synced 2025-04-22 17:02:03 +02:00
Fixed duplicate in log_display, and improved installation
for non-English users
This commit is contained in:
parent
2eb68e6f6b
commit
f28db22d06
@ -122,6 +122,26 @@
|
||||
die;
|
||||
}
|
||||
|
||||
|
||||
/// Insert default values for any important configuration variables
|
||||
|
||||
include_once("$CFG->dirroot/lib/defaults.php");
|
||||
|
||||
foreach ($defaults as $name => $value) {
|
||||
if (!isset($CFG->$name)) {
|
||||
$CFG->$name = $value;
|
||||
set_config($name, $value);
|
||||
$configchange = true;
|
||||
}
|
||||
}
|
||||
|
||||
/// If any new configurations were found then send to the config page to check
|
||||
|
||||
if (!empty($configchange)) {
|
||||
redirect("config.php");
|
||||
}
|
||||
|
||||
|
||||
/// Check version of Moodle code on disk compared with database
|
||||
/// and upgrade if possible.
|
||||
|
||||
@ -193,25 +213,6 @@
|
||||
}
|
||||
|
||||
|
||||
/// Insert default values for any important configuration variables
|
||||
|
||||
include_once("$CFG->dirroot/lib/defaults.php");
|
||||
|
||||
foreach ($defaults as $name => $value) {
|
||||
if (!isset($CFG->$name)) {
|
||||
$CFG->$name = $value;
|
||||
set_config($name, $value);
|
||||
$configchange = true;
|
||||
}
|
||||
}
|
||||
|
||||
/// If any new configurations were found then send to the config page to check
|
||||
|
||||
if (!empty($configchange)) {
|
||||
redirect("config.php");
|
||||
}
|
||||
|
||||
|
||||
/// Upgrade backup/restore system if necessary
|
||||
require_once("$CFG->dirroot/backup/lib.php");
|
||||
upgrade_backup_db("$CFG->wwwroot/$CFG->admin/index.php"); // Return here afterwards
|
||||
|
@ -794,6 +794,12 @@ function main_upgrade($oldversion=0) {
|
||||
table_column('course', '', 'enrolperiod', 'int', '10', 'unsigned', '0', 'not null', 'startdate');
|
||||
}
|
||||
|
||||
if ($oldversion < 2004072901) { // Fixing error in schema
|
||||
if ($record = get_record('log_display', 'module', 'course', 'action', 'update')) {
|
||||
delete_records('log_display', 'module', 'course', 'action', 'update');
|
||||
insert_record('log_display', $record, false, 'module');
|
||||
}
|
||||
}
|
||||
|
||||
return $result;
|
||||
|
||||
|
@ -432,4 +432,3 @@ INSERT INTO prefix_log_display VALUES ('course', 'user report', 'user', 'CONCAT(
|
||||
INSERT INTO prefix_log_display VALUES ('course', 'view', 'course', 'fullname');
|
||||
INSERT INTO prefix_log_display VALUES ('course', 'update', 'course', 'fullname');
|
||||
INSERT INTO prefix_log_display VALUES ('course', 'enrol', 'course', 'fullname');
|
||||
INSERT INTO prefix_log_display VALUES ('course', 'update', 'course', 'fullname');
|
||||
|
@ -536,6 +536,14 @@ function main_upgrade($oldversion=0) {
|
||||
table_column('course', '', 'enrolperiod', 'int', '10', 'unsigned', '0', 'not null', 'startdate');
|
||||
}
|
||||
|
||||
if ($oldversion < 2004072901) { // Fixing error in schema
|
||||
if ($record = get_record('log_display', 'module', 'course', 'action', 'update')) {
|
||||
delete_records('log_display', 'module', 'course', 'action', 'update');
|
||||
insert_record('log_display', $record, false, 'module');
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
return $result;
|
||||
|
||||
}
|
||||
|
@ -285,4 +285,3 @@ INSERT INTO prefix_log_display VALUES ('course', 'user report', 'user', 'CONCAT(
|
||||
INSERT INTO prefix_log_display VALUES ('course', 'view', 'course', 'fullname');
|
||||
INSERT INTO prefix_log_display VALUES ('course', 'update', 'course', 'fullname');
|
||||
INSERT INTO prefix_log_display VALUES ('course', 'enrol', 'course', 'fullname');
|
||||
INSERT INTO prefix_log_display VALUES ('course', 'update', 'course', 'fullname');
|
||||
|
@ -5,7 +5,7 @@
|
||||
// database to determine whether upgrades should
|
||||
// be performed (see lib/db/*.php)
|
||||
|
||||
$version = 2004072900; // The current version is a date (YYYYMMDDXX)
|
||||
$version = 2004072901; // The current version is a date (YYYYMMDDXX)
|
||||
|
||||
$release = "1.4 development"; // User-friendly version number
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user