From ed3ffcfdca9fec65529b1a7f1dca8ee2bad7dd26 Mon Sep 17 00:00:00 2001 From: Peter Date: Thu, 15 Oct 2026 23:10:39 +0200 Subject: [PATCH 1/2] Revert "fix(routing): ship the legacy alias cache and read it instead of rebuilding it (#605) (#606)" This reverts commit 97bb35281af0996bbec0aab04ae32b6876bdc923. --- .gitignore | 1 - build/alias.cache.ini | 7 ------- rox_docker.ini | 2 +- 3 files changed, 1 insertion(+), 9 deletions(-) delete mode 100644 build/alias.cache.ini diff --git a/.gitignore b/.gitignore index 05b8414759..b5302b9aa1 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,6 @@ errors.log rox_local.ini *.cache.ini -!/build/alias.cache.ini .php_cs.cache .phpunit.result.cache /data/* diff --git a/build/alias.cache.ini b/build/alias.cache.ini deleted file mode 100644 index d1b2ab87c7..0000000000 --- a/build/alias.cache.ini +++ /dev/null @@ -1,7 +0,0 @@ -searchmembers = searchpeople search findmembers findpeople find quicksearch -donate = donation donations -link = friends -members = member people updatemandatory setlocation mypreferences editmyprofile deleteprofile myvisitors my self flagcomment -places = country countries -polls = polls votes -rss = feed diff --git a/rox_docker.ini b/rox_docker.ini index c262259f22..2972b9482c 100644 --- a/rox_docker.ini +++ b/rox_docker.ini @@ -103,7 +103,7 @@ compress_js = 1 ; syshcvol settings (legacy). This will go to $_SYSHCVOL global var. [syshcvol] -IniCache = "1" +IniCache = "0" NODBAUTOUPDATE = "0" ARCH_DB = "" CRYPT_DB = "" From b3db6354192ac4f68c4f660f1b0508d6e8e614be Mon Sep 17 00:00:00 2001 From: Peter Date: Thu, 15 Oct 2026 23:10:40 +0200 Subject: [PATCH 2/2] Revert "fix(analytics): login reminder UTM uses source 'reminder', campaign 'login_reminder' (#590) (#603)" This reverts commit 4b5adf3bbea8c67cbb52b89c749942d34ea3de9c. --- templates/emails/login.reminder.html.twig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/emails/login.reminder.html.twig b/templates/emails/login.reminder.html.twig index 7b7fe3810b..424ef7527a 100644 --- a/templates/emails/login.reminder.html.twig +++ b/templates/emails/login.reminder.html.twig @@ -1,6 +1,6 @@ -{# utm_links(campaign, source): every bewelcome.org link carries source 'reminder' and campaign - 'login_reminder', so Plausible groups all reminders under one source, like newsletters (#540). #} -{% block content %}{% apply inky_to_html|utm_links('login_reminder', 'reminder')|inline_css(encore_entry_css_source('email')) %} +{# utm_links: every bewelcome.org link carries the newsletter as campaign, so Plausible + can attribute visits, signups and donations to it (#540). #} +{% block content %}{% apply inky_to_html|utm_links('reminder', 'login_reminder')|inline_css(encore_entry_css_source('email')) %}