Merge branch 'wip-MDL-45104-master-v2' of git://github.com/abgreeve/moodle
This commit is contained in:
@@ -287,6 +287,7 @@ class core_admin_renderer extends plugin_renderer_base {
|
||||
|
||||
$output .= $this->header();
|
||||
$output .= $this->maturity_info($maturity);
|
||||
$output .= $this->legacy_log_store_writting_error();
|
||||
$output .= empty($CFG->disableupdatenotifications) ? $this->available_updates($availableupdates, $availableupdatesfetch) : '';
|
||||
$output .= $this->insecure_dataroot_warning($insecuredataroot);
|
||||
$output .= $this->display_errors_warning($errorsdisplayed);
|
||||
@@ -1954,4 +1955,16 @@ class core_admin_renderer extends plugin_renderer_base {
|
||||
|
||||
return $output;
|
||||
}
|
||||
|
||||
/**
|
||||
* Check to see if writing to the deprecated legacy log store is enabled.
|
||||
*
|
||||
* @return string An error message if writing to the legacy log store is enabled.
|
||||
*/
|
||||
protected function legacy_log_store_writting_error() {
|
||||
$enabled = get_config('logstore_legacy', 'loglegacy');
|
||||
if ($enabled) {
|
||||
return $this->warning(get_string('legacylogginginuse'), 'error');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -182,6 +182,8 @@ class store implements \tool_log\log\store, \core\log\sql_reader {
|
||||
|
||||
/**
|
||||
* Legacy add_to_log() code.
|
||||
* @deprecated since Moodle 3.1 MDL-45104 - Please use supported log stores such as "standard" or "external" instead.
|
||||
* @todo MDL-52805 This will be removed in Moodle 3.3
|
||||
*
|
||||
* @param int $courseid The course id
|
||||
* @param string $module The module name e.g. forum, journal, resource, course, user etc
|
||||
|
||||
@@ -1032,6 +1032,7 @@ $string['lastyear'] = 'Last year';
|
||||
$string['latestlanguagepack'] = 'Check for latest language pack on moodle.org';
|
||||
$string['layouttable'] = 'Layout table';
|
||||
$string['leavetokeep'] = 'Leave blank to keep current password';
|
||||
$string['legacylogginginuse'] = 'This site currently has writting to the legacy log store enabled. Writing to this log store is deprecated. Please write to a supported log store such as "standard" or "external".';
|
||||
$string['legacythemeinuse'] = 'This site is being displayed to you in compatibility mode because your browser is too old.';
|
||||
$string['license'] = 'Licence';
|
||||
$string['licenses'] = 'Licences';
|
||||
|
||||
Reference in New Issue
Block a user