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

Merge branch 'MDL-45104-master-fix' of github.com:xow/moodle

Browse Source
This commit is contained in:
Andrew Nicols
2016-02-25 10:14:06 +08:00
parent 7204460d5a a285d561ef
commit 84fbbd9985
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/renderer.php
+5 -2
View File
@@ -287,7 +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 .= $this->legacy_log_store_writing_error();
$output .= empty($CFG->disableupdatenotifications) ? $this->available_updates($availableupdates, $availableupdatesfetch) : '';
$output .= $this->insecure_dataroot_warning($insecuredataroot);
$output .= $this->display_errors_warning($errorsdisplayed);
@@ -1961,8 +1961,11 @@ class core_admin_renderer extends plugin_renderer_base {
*
* @return string An error message if writing to the legacy log store is enabled.
*/
protected function legacy_log_store_writting_error() {
protected function legacy_log_store_writing_error() {
$enabled = get_config('logstore_legacy', 'loglegacy');
$plugins = explode(',', get_config('tool_log', 'enabled_stores'));
$enabled = $enabled && in_array('logstore_legacy', $plugins);
if ($enabled) {
return $this->warning(get_string('legacylogginginuse'));
}
lang/en/moodle.php
+1 -1
View File
@@ -1032,7 +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['legacylogginginuse'] = 'This site currently has writing 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';