From f3b1c9f70a162c7a2ca2d984fd78620ab50631f6 Mon Sep 17 00:00:00 2001 From: flashwave Date: Tue, 26 May 2020 13:18:37 +0000 Subject: [PATCH] Fixed canonical url on changelog index. --- src/TwigMisuzu.php | 1 - src/url.php | 2 +- templates/changelog/index.twig | 8 ++++---- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/TwigMisuzu.php b/src/TwigMisuzu.php index 4c801728..ebe0353b 100644 --- a/src/TwigMisuzu.php +++ b/src/TwigMisuzu.php @@ -18,7 +18,6 @@ final class TwigMisuzu extends Twig_Extension { new Twig_Filter('perms_check', 'perms_check'), new Twig_Filter('bg_settings', 'user_background_settings_strings'), new Twig_Filter('clamp', 'clamp'), - new Twig_Filter('as_platform', fn(string $userAgent) => (new \WhichBrowser\Parser($userAgent))->toString()), ]; } diff --git a/src/url.php b/src/url.php index dab0cfb4..a46e2993 100644 --- a/src/url.php +++ b/src/url.php @@ -24,7 +24,7 @@ define('MSZ_URLS', [ 'auth-resolve-user' => ['/auth/login.php', ['resolve_user' => '']], 'auth-two-factor' => ['/auth/twofactor.php', ['token' => '']], - 'changelog-index' => ['/changelog', ['date' => '', 'user' => '', 'tags' => '']], + 'changelog-index' => ['/changelog', ['date' => '', 'user' => '', 'tags' => '', 'p' => '']], 'changelog-feed-rss' => ['/changelog.rss'], 'changelog-feed-atom' => ['/changelog.atom'], 'changelog-change' => ['/changelog/change/'], diff --git a/templates/changelog/index.twig b/templates/changelog/index.twig index 5f4ec819..fb766f8c 100644 --- a/templates/changelog/index.twig +++ b/templates/changelog/index.twig @@ -8,10 +8,10 @@ {% set title = 'Changelog' %} {% set changelog_date_fmt = changelog_date|default(false) ? changelog_date|date('Y-m-d') : '' %} -{% set canonical_url = url_construct(url('changelog-index'), { - 'd': changelog_date_fmt, - 'u': changelog_user.id|default(0), - 'p': changelog_pagination.page, +{% set canonical_url = url('changelog-index', { + 'date': changelog_date_fmt, + 'user': changelog_user.id|default(0), + 'page': changelog_pagination.page < 2 ? 0 : changelog_pagination.page, }) %} {% if is_date or is_user %}