Skip to content
Snippets Groups Projects
Commit 25e70712 authored by Joshua Roberson's avatar Joshua Roberson
Browse files

Remove extra condition and adjust comments

parent 30b33ddd
Branches dev
Tags 8.x-1.2
No related merge requests found
...@@ -38,7 +38,7 @@ function block_region_permissions_form_block_admin_display_form_alter(&$form, Fo ...@@ -38,7 +38,7 @@ function block_region_permissions_form_block_admin_display_form_alter(&$form, Fo
// Region label or message. // Region label or message.
list(, $region_key,) = explode('-', $block_key); list(, $region_key,) = explode('-', $block_key);
} }
elseif (substr($block_key, 0, 7) != 'region-' && $block = Block::load($block_key)) { elseif ($block = Block::load($block_key)) {
// Region block. // Region block.
$region_key = $block->getRegion(); $region_key = $block->getRegion();
// Save master list of options one time. // Save master list of options one time.
...@@ -69,8 +69,7 @@ function block_region_permissions_form_block_admin_display_form_alter(&$form, Fo ...@@ -69,8 +69,7 @@ function block_region_permissions_form_block_admin_display_form_alter(&$form, Fo
} }
} }
// Remove region select field options for regions the user cannot // Remove region select field options for regions the user cannot administer.
// administer.
if (!empty($region_block_keys)) { if (!empty($region_block_keys)) {
// Remove options from master list. // Remove options from master list.
foreach ($region_options as $region_key => $options) { foreach ($region_options as $region_key => $options) {
...@@ -96,8 +95,7 @@ function block_region_permissions_form_block_form_alter(&$form, FormStateInterfa ...@@ -96,8 +95,7 @@ function block_region_permissions_form_block_form_alter(&$form, FormStateInterfa
// Get theme name. // Get theme name.
$theme_key = $form['theme']['#value']; $theme_key = $form['theme']['#value'];
// Remove region select field options for regions the user cannot // Remove region select field options for regions the user cannot administer.
// administer.
$region_options = $form['region']['#options']; $region_options = $form['region']['#options'];
foreach ($region_options as $region_key => $options) { foreach ($region_options as $region_key => $options) {
if (!\Drupal::currentUser()->hasPermission("administer $theme_key $region_key")) { if (!\Drupal::currentUser()->hasPermission("administer $theme_key $region_key")) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment