@@ -16,11 +16,11 @@ function custom_block_help($path, $arg) {
case'admin/help#custom_block':
returnt('Allows the creation of custom blocks through the user interface.');
case'admin/structure/custom-blocks':
case'admin/structure/block/custom-blocks':
$output='<p>'.t('This page lists user-created blocks. These blocks are derived from block types. A block type can consist of different fields and display settings. From the block types tab you can manage these fields as well as create new block types.').'</p>';
return$output;
case'admin/structure/custom-blocks/types':
case'admin/structure/block/custom-blocks/types':
$output='<p>'.t('This page lists block types. A block type can consist of different fields and display settings. From here you can manage these fields as well as create new block types.').'</p>';
return$output;
...
...
@@ -37,7 +37,7 @@ function custom_block_menu_local_tasks(&$data, $router_item, $root_path) {
@@ -101,7 +101,7 @@ public function save(array $form, array &$form_state) {
watchdog('custom_block','Custom block type %label has been added.',array('%label'=>$block_type->label()),WATCHDOG_NOTICE,l(t('Edit'),$uri['path'].'/edit'));
t('%label is used by 1 custom block on your site. You can not remove this block type until you have removed all of the %label blocks.',array('%label'=>$type->label())),
'The block type will not be deleted until all blocks of that type are removed.'
...
...
@@ -129,7 +129,7 @@ public function testCustomBlockTypeDeletion() {
// Delete the block.
$block->delete();
// Attempt to delete the block type, which should now be allowed.