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

Merge branch 'feature/MDL-56830' of https://github.com/fwsl/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2016-12-13 12:00:46 +01:00
parent bd31523a30 3118ff6f41
commit ab73c1ddbb
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/blocks.php
+2
View File
@@ -37,6 +37,7 @@
print_error('blockdoesnotexist', 'error');
}
$DB->set_field('block', 'visible', '0', array('id'=>$block->id)); // Hide block
add_to_config_log('block_visibility', $block->visible, '0', $block->name);
core_plugin_manager::reset_caches();
admin_get_root(true, false); // settings not required - only pages
}
@@ -46,6 +47,7 @@
print_error('blockdoesnotexist', 'error');
}
$DB->set_field('block', 'visible', '1', array('id'=>$block->id)); // Show block
add_to_config_log('block_visibility', $block->visible, '1', $block->name);
core_plugin_manager::reset_caches();
admin_get_root(true, false); // settings not required - only pages
}
lib/blocklib.php
+2
View File
@@ -420,6 +420,7 @@ class block_manager {
if (!in_array($block->name, $undeletableblocktypes)) {
$undeletableblocktypes[] = $block->name;
set_config('undeletableblocktypes', implode(',', $undeletableblocktypes));
add_to_config_log('block_protect', "0", "1", $block->name);
}
}
@@ -445,6 +446,7 @@ class block_manager {
if (in_array($block->name, $undeletableblocktypes)) {
$undeletableblocktypes = array_diff($undeletableblocktypes, array($block->name));
set_config('undeletableblocktypes', implode(',', $undeletableblocktypes));
add_to_config_log('block_protect', "1", "0", $block->name);
}
}