From 6791cfbce7c1081255e28d196a1beb4ce8a01dbe Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Thu, 23 Jun 2016 18:09:34 +0200
Subject: [PATCH] Fixed duplicate link rel="canonical" tags

---
 com.woltlab.wcf/templates/recentActivityList.tpl       |  4 ----
 com.woltlab.wcf/templates/team.tpl                     |  4 ----
 com.woltlab.wcf/templates/user.tpl                     |  2 --
 com.woltlab.wcf/templates/usersOnlineList.tpl          |  2 +-
 .../files/lib/page/RecentActivityListPage.class.php    | 10 ++++++++++
 wcfsetup/install/files/lib/page/TeamPage.class.php     | 10 ++++++++++
 6 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/com.woltlab.wcf/templates/recentActivityList.tpl b/com.woltlab.wcf/templates/recentActivityList.tpl
index 71d41cca7a..6c462c479e 100644
--- a/com.woltlab.wcf/templates/recentActivityList.tpl
+++ b/com.woltlab.wcf/templates/recentActivityList.tpl
@@ -1,7 +1,3 @@
-{capture assign='headContent'}
-	<link rel="canonical" href="{link controller='RecentActivityList'}{/link}">
-{/capture}
-
 {include file='header'}
 
 {if $eventList|count}
diff --git a/com.woltlab.wcf/templates/team.tpl b/com.woltlab.wcf/templates/team.tpl
index 3ebeb973df..5491624da6 100644
--- a/com.woltlab.wcf/templates/team.tpl
+++ b/com.woltlab.wcf/templates/team.tpl
@@ -1,7 +1,3 @@
-{capture assign='headContent'}
-	<link rel="canonical" href="{link controller='Team'}{/link}">
-{/capture}
-
 {include file='header'}
 
 {foreach from=$objects->getTeams() item=team}
diff --git a/com.woltlab.wcf/templates/user.tpl b/com.woltlab.wcf/templates/user.tpl
index 016050893d..c6484b8614 100644
--- a/com.woltlab.wcf/templates/user.tpl
+++ b/com.woltlab.wcf/templates/user.tpl
@@ -3,8 +3,6 @@
 {assign var='contentHeader' value=' '}{* necessary to hide default content header in heade.tpl *}
 
 {capture assign='headContent'}
-	<link rel="canonical" href="{link controller='User' object=$user}{/link}">
-	
 	{event name='javascriptInclude'}
 	<script data-relocate="true">
 		{if $__wcf->getUser()->userID && $__wcf->getUser()->userID != $user->userID}
diff --git a/com.woltlab.wcf/templates/usersOnlineList.tpl b/com.woltlab.wcf/templates/usersOnlineList.tpl
index 0cc97028ba..e183415a80 100644
--- a/com.woltlab.wcf/templates/usersOnlineList.tpl
+++ b/com.woltlab.wcf/templates/usersOnlineList.tpl
@@ -1,7 +1,7 @@
 {capture assign='pageTitle'}{$__wcf->getActivePage()->getTitle()}{if $pageNo > 1} - {lang}wcf.page.pageNo{/lang}{/if}{/capture}
 
 {capture assign='headContent'}
-	<link rel="canonical" href="{link controller='UsersOnlineList'}{/link}">
+	<link rel="canonical" href="{link controller='UsersOnlineList'}{if $pageNo > 1}pageNo={@$pageNo}{/if}{/link}">
 	
 	{if USERS_ONLINE_PAGE_REFRESH > 0}
 		<meta http-equiv="refresh" content="{@USERS_ONLINE_PAGE_REFRESH}; url={link controller='UsersOnlineList'}{if $pageNo > 1}pageNo={@$pageNo}&{/if}sortField={@$sortField}&sortOrder={@$sortOrder}{/link}">
diff --git a/wcfsetup/install/files/lib/page/RecentActivityListPage.class.php b/wcfsetup/install/files/lib/page/RecentActivityListPage.class.php
index 30da476583..d018bb58b1 100644
--- a/wcfsetup/install/files/lib/page/RecentActivityListPage.class.php
+++ b/wcfsetup/install/files/lib/page/RecentActivityListPage.class.php
@@ -2,6 +2,7 @@
 namespace wcf\page;
 use wcf\data\user\activity\event\ViewableUserActivityEventList;
 use wcf\system\page\PageLocationManager;
+use wcf\system\request\LinkHandler;
 use wcf\system\user\activity\event\UserActivityEventHandler;
 use wcf\system\WCF;
 
@@ -20,6 +21,15 @@ class RecentActivityListPage extends AbstractPage {
 	 */
 	public $eventList = null;
 	
+	/**
+	 * @inheritDoc
+	 */
+	public function readParameters() {
+		parent::readParameters();
+		
+		$this->canonicalURL = LinkHandler::getInstance()->getLink('RecentActivityList');
+	}
+	
 	/**
 	 * @inheritDoc
 	 */
diff --git a/wcfsetup/install/files/lib/page/TeamPage.class.php b/wcfsetup/install/files/lib/page/TeamPage.class.php
index a0d2aa4e47..5963701be0 100644
--- a/wcfsetup/install/files/lib/page/TeamPage.class.php
+++ b/wcfsetup/install/files/lib/page/TeamPage.class.php
@@ -2,6 +2,7 @@
 namespace wcf\page;
 use wcf\data\user\TeamList;
 use wcf\system\page\PageLocationManager;
+use wcf\system\request\LinkHandler;
 use wcf\system\WCF;
 
 /**
@@ -45,6 +46,15 @@ class TeamPage extends MultipleLinkPage {
 	 */
 	public $objectListClassName = TeamList::class;
 	
+	/**
+	 * @inheritDoc
+	 */
+	public function readParameters() {
+		parent::readParameters();
+		
+		$this->canonicalURL = LinkHandler::getInstance()->getLink('Team');
+	}
+	
 	/**
 	 * @inheritDoc
 	 */
-- 
2.20.1