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

Issue #2031437 by fgm, benjy: Fixed Blocks no longer use 'delta'. Remove it from derivative plugins.

8.0.x
webchick 2013-08-10 02:02:12 -07:00
parent 7a82f32a6f
commit 6bf5aec91e
2 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/modules/aggregator/lib/Drupal/aggregator/Plugin/Derivative/AggregatorCategoryBlock.php
View File

@ -83,7 +83,6 @@ class AggregatorCategoryBlock implements ContainerDerivativeInterface {
}
$result = $this->connection->query('SELECT cid, title FROM {aggregator_category} ORDER BY title WHERE cid = :cid', array(':cid' => $derivative_id))->fetchObject();
$this->derivatives[$derivative_id] = $base_plugin_definition;
$this->derivatives[$derivative_id]['delta'] = $result->cid;
$this->derivatives[$derivative_id]['admin_label'] = $this->translationManager->translate('@title category latest items', array('@title' => $result->title));
return $this->derivatives[$derivative_id];
}
@ -96,7 +95,6 @@ class AggregatorCategoryBlock implements ContainerDerivativeInterface {
$result = $this->connection->query('SELECT cid, title FROM {aggregator_category} ORDER BY title');
foreach ($result as $category) {
$this->derivatives[$category->cid] = $base_plugin_definition;
$this->derivatives[$category->cid]['delta'] = $category->cid;
$this->derivatives[$category->cid]['admin_label'] = $this->translationManager->translate('@title category latest items', array('@title' => $category->title));
}
return $this->derivatives;

1
core/modules/system/lib/Drupal/system/Plugin/Derivative/SystemMenuBlock.php
View File

@ -25,7 +25,6 @@ class SystemMenuBlock extends DerivativeBase {
// menu would otherwise clash with the 'main' page content block.
$menu_key = 'menu-' . $menu;
$this->derivatives[$menu_key] = $base_plugin_definition;
$this->derivatives[$menu_key]['delta'] = $menu_key;
// It is possible that users changed the menu label. Fall back on the
// built-in menu label if the entity was not found.
$entity = entity_load('menu', $menu);