Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #2408977 by geertvd: Fatal error: Cannot access protected property Drupal\block\Entity\Block::$id

8.0.x
Alex Pott 2015-02-06 20:43:21 +00:00
parent 94c7316aff
commit ffea3bb91d
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/modules/language/src/Form/NegotiationConfigureForm.php
View File

@ -334,7 +334,7 @@ class NegotiationConfigureForm extends ConfigFormBase {
$blocks = $this->blockStorage->loadByProperties(array('theme' => $theme)); $blocks = $this->blockStorage->loadByProperties(array('theme' => $theme));
foreach ($language_types as $language_type) { foreach ($language_types as $language_type) {
foreach ($blocks as $block) { foreach ($blocks as $block) {
if (strpos($block->id, 'language_switcher_' . substr($language_type, 9)) !== FALSE) { if ($block->getPluginId() == 'language_block:' . $language_type) {
$block->delete(); $block->delete();
} }
} }

26
core/modules/language/src/Tests/LanguageUILanguageNegotiationTest.php
View File

@ -20,6 +20,7 @@ use Drupal\Core\Language\Language;
use Drupal\Core\Language\LanguageInterface; use Drupal\Core\Language\LanguageInterface;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
use Drupal\language\LanguageNegotiatorInterface; use Drupal\language\LanguageNegotiatorInterface;
use Drupal\block\Entity\Block;
/** /**
* Tests UI language switching. * Tests UI language switching.
@ -502,4 +503,29 @@ class LanguageUILanguageNegotiationTest extends WebTestBase {
$this->assertFalse(array_key_exists('language-url', $config->get('negotiation.language_content.enabled')), 'URL negotiation is not enabled for content.'); $this->assertFalse(array_key_exists('language-url', $config->get('negotiation.language_content.enabled')), 'URL negotiation is not enabled for content.');
$this->assertTrue(array_key_exists('language-session', $config->get('negotiation.language_content.enabled')), 'Session negotiation is enabled for content.'); $this->assertTrue(array_key_exists('language-session', $config->get('negotiation.language_content.enabled')), 'Session negotiation is enabled for content.');
} }
/**
* Tests if the language switcher block gets deleted when a language type has been made not configurable.
*/
public function testDisableLanguageSwitcher() {
$block_id = 'test_language_block';
// Enable the language switcher block.
$this->drupalPlaceBlock('language_block:' . LanguageInterface::TYPE_CONTENT, array('id' => $block_id));
// Check if the language switcher block has been created.
$block = Block::load($block_id);
$this->assertTrue($block, 'Language switcher block was created.');
// Make sure language_content is not configurable.
$edit = array(
'language_content[configurable]' => FALSE,
);
$this->drupalPostForm('admin/config/regional/language/detection', $edit, t('Save settings'));
$this->assertResponse(200);
// Check if the language switcher block has been removed.
$block = Block::load($block_id);
$this->assertFalse($block, 'Language switcher block was removed.');
}
} }