diff --git a/core/modules/forum/lib/Drupal/forum/Controller/ForumController.php b/core/modules/forum/lib/Drupal/forum/Controller/ForumController.php index 87d5fa4..54a7e41 100644 --- a/core/modules/forum/lib/Drupal/forum/Controller/ForumController.php +++ b/core/modules/forum/lib/Drupal/forum/Controller/ForumController.php @@ -101,8 +101,7 @@ public function forumPage(TermInterface $taxonomy_term) { * A render array. */ public function forumIndex() { - $vocabularies = $this->storageController->load(array($this->config->get('vocabulary'))); - $vocabulary = reset($vocabularies); + $vocabulary = $this->storageController->load($this->config->get('vocabulary')); $index = $this->forumManager->getIndex(); if (empty($index->forums)) { // Root of empty forum. diff --git a/core/modules/forum/lib/Drupal/forum/ForumManager.php b/core/modules/forum/lib/Drupal/forum/ForumManager.php index 6af5e0a..c71dca9 100644 --- a/core/modules/forum/lib/Drupal/forum/ForumManager.php +++ b/core/modules/forum/lib/Drupal/forum/ForumManager.php @@ -168,7 +168,7 @@ public function getTopics($tid) { $nids[] = $record->nid; } if ($nids) { - $nodes = $this->entityManager->getStorageController('node')->load($nids); + $nodes = $this->entityManager->getStorageController('node')->loadMultiple($nids); $query = $this->connection->select('node_field_data', 'n') ->extend('Drupal\Core\Database\Query\TableSortExtender');