Upgraded drupal core with security updates

[yaffs-website] / web / core / lib / Drupal / Core / Block / BlockManager.php

diff --git a/web/core/lib/Drupal/Core/Block/BlockManager.php b/web/core/lib/Drupal/Core/Block/BlockManager.php
index a837340a3c24c60bf2687694254b988181b6979f..30b52b612566e34ceab848513110697284912a71 100644 (file)
--- a/web/core/lib/Drupal/Core/Block/BlockManager.php
+++ b/web/core/lib/Drupal/Core/Block/BlockManager.php
@@ -20,7 +20,6 @@ class BlockManager extends DefaultPluginManager implements BlockManagerInterface
 
   use CategorizingPluginManagerTrait {
     getSortedDefinitions as traitGetSortedDefinitions;
 
   use CategorizingPluginManagerTrait {
     getSortedDefinitions as traitGetSortedDefinitions;

-    getGroupedDefinitions as traitGetGroupedDefinitions;

   }
   use ContextAwarePluginManagerTrait;
 
   }
   use ContextAwarePluginManagerTrait;
 


@@ -54,23 +53,13 @@ class BlockManager extends DefaultPluginManager implements BlockManagerInterface
    * {@inheritdoc}
    */
   public function getSortedDefinitions(array $definitions = NULL) {
    * {@inheritdoc}
    */
   public function getSortedDefinitions(array $definitions = NULL) {

-    // Sort the plugins first by category, then by label.
+    // Sort the plugins first by category, then by admin label.

     $definitions = $this->traitGetSortedDefinitions($definitions, 'admin_label');
     // Do not display the 'broken' plugin in the UI.
     unset($definitions['broken']);
     return $definitions;
   }
 
     $definitions = $this->traitGetSortedDefinitions($definitions, 'admin_label');
     // Do not display the 'broken' plugin in the UI.
     unset($definitions['broken']);
     return $definitions;
   }
 

-  /**
-   * {@inheritdoc}
-   */
-  public function getGroupedDefinitions(array $definitions = NULL) {
-    $definitions = $this->traitGetGroupedDefinitions($definitions, 'admin_label');
-    // Do not display the 'broken' plugin in the UI.
-    unset($definitions[$this->t('Block')]['broken']);
-    return $definitions;
-  }
-

   /**
    * {@inheritdoc}
    */
   /**
    * {@inheritdoc}
    */