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

Issue #2350309 by droplet, larowlan: Forum index links head to taxonomy/term/{term} instead of forum/{term}

8.0.x
webchick 2014-12-14 13:53:22 -08:00
parent 12bdc6cd30
commit 7abdb6540b
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/modules/forum/forum.module
View File

@ -568,7 +568,7 @@ function template_preprocess_forum_list(&$variables) {
// Sanitize each forum so that the template can safely print the data. // Sanitize each forum so that the template can safely print the data.
foreach ($variables['forums'] as $id => $forum) { foreach ($variables['forums'] as $id => $forum) {
$variables['forums'][$id]->description = Xss::filterAdmin($forum->description->value); $variables['forums'][$id]->description = Xss::filterAdmin($forum->description->value);
$variables['forums'][$id]->link = $forum->url(); $variables['forums'][$id]->link = forum_uri($forum);
$variables['forums'][$id]->name = String::checkPlain($forum->label()); $variables['forums'][$id]->name = String::checkPlain($forum->label());
$variables['forums'][$id]->is_container = !empty($forum->forum_container->value); $variables['forums'][$id]->is_container = !empty($forum->forum_container->value);
$variables['forums'][$id]->zebra = $row % 2 == 0 ? 'odd' : 'even'; $variables['forums'][$id]->zebra = $row % 2 == 0 ? 'odd' : 'even';

5
core/modules/forum/src/Tests/ForumTest.php
View File

@ -10,6 +10,7 @@ namespace Drupal\forum\Tests;
use Drupal\Core\Entity\EntityInterface; use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Link; use Drupal\Core\Link;
use Drupal\simpletest\WebTestBase; use Drupal\simpletest\WebTestBase;
use Drupal\Core\Url;
/** /**
* Create, view, edit, delete, and change forum entries and verify its * Create, view, edit, delete, and change forum entries and verify its
@ -107,9 +108,9 @@ class ForumTest extends WebTestBase {
*/ */
function testForum() { function testForum() {
//Check that the basic forum install creates a default forum topic //Check that the basic forum install creates a default forum topic
$this->drupalGet("/forum"); $this->drupalGet('/forum');
// Look for the "General discussion" default forum // Look for the "General discussion" default forum
$this->assertText(t("General discussion"), "Found the default forum at the /forum listing"); $this->assertRaw(t('<a href="'. Url::fromRoute('forum.page', ['taxonomy_term' => 1]) .'">General discussion</a>'), "Found the default forum at the /forum listing");
// Do the admin tests. // Do the admin tests.
$this->doAdminTests($this->admin_user); $this->doAdminTests($this->admin_user);