diff --git a/core/modules/forum/src/Form/Overview.php b/core/modules/forum/src/Form/Overview.php index 0487a2e..eb05b3a 100644 --- a/core/modules/forum/src/Form/Overview.php +++ b/core/modules/forum/src/Form/Overview.php @@ -31,12 +31,12 @@ class Overview extends OverviewTerms { /** * Constructs a \Drupal\forum\Form\OverviewForm object. * + * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler + * The module handler service. * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager * The entity manager service. - * @param \Drupal\Core\Extension\ModuleHandlerInteface $module_handler - * The module handler service. */ - public function __construct(EntityManagerInterface $entity_manager, ModuleHandlerInterface $module_handler) { + public function __construct(ModuleHandlerInterface $module_handler, EntityManagerInterface $entity_manager) { parent::__construct($module_handler, $entity_manager); $this->entityManager = $entity_manager; } @@ -44,16 +44,6 @@ public function __construct(EntityManagerInterface $entity_manager, ModuleHandle /** * {@inheritdoc} */ - public static function create(ContainerInterface $container) { - return new static( - $container->get('entity.manager'), - $container->get('module_handler') - ); - } - - /** - * {@inheritdoc} - */ public function getFormId() { return 'forum_overview'; } diff --git a/core/modules/taxonomy/src/TermStorage.php b/core/modules/taxonomy/src/TermStorage.php index a76f2d0..015baed 100644 --- a/core/modules/taxonomy/src/TermStorage.php +++ b/core/modules/taxonomy/src/TermStorage.php @@ -360,7 +360,7 @@ public function getNodeTerms($nids, $vocabs = array(), $langcode = NULL) { public function __sleep() { $vars = parent::__sleep(); // Do not serialize static cache. - unset($vars['parents'], $vars['parentsAll'], $vars['children'], $vars['treeChildren'], $vars['treeParents'], $vars['treeTerms'], $var['trees']); + unset($vars['parents'], $vars['parentsAll'], $vars['children'], $vars['treeChildren'], $vars['treeParents'], $vars['treeTerms'], $vars['trees']); return $vars; }