Skip to content
Browse files

Merge branch 'MDL-55166-master-blocksettings' of git://…

  • Loading branch information...
stronk7 committed Aug 2, 2016
2 parents 8c7840d + 0d7c417 commit a9b1af901b1acf032b9daa1c7b79b225a11f544b
Showing with 4 additions and 1 deletion.
  1. +4 −1 admin/blocks.php
@@ -154,7 +154,10 @@
$settings = '<a href="' . $blocksettings->url . '">' . get_string('settings') . '</a>';
} else if ($blocksettings instanceof admin_settingpage) {
$settings = '<a href="'.$CFG->wwwroot.'/'.$CFG->admin.'/settings.php?section=blocksetting'.$block->name.'">'.$strsettings.'</a>';
} else {
} else if (!file_exists($CFG->dirroot.'/blocks/'.$block->name.'/settings.php')) {
// If the block's settings node was not found, we check that the block really provides the settings.php file.
// Note that blocks can inject their settings to other nodes in the admin tree without using the default locations.
// This can be done by assigning null to $setting in settings.php and it is a valid case.
debugging('Warning: block_'.$block->name.' returns true in has_config() but does not provide a settings.php file',

0 comments on commit a9b1af9

Please sign in to comment.
You can’t perform that action at this time.