diff --git a/.gitignore b/.gitignore index 05b841475..b5302b9aa 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 d1b2ab87c..000000000 --- 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 c262259f2..2972b9482 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 = "" diff --git a/templates/emails/login.reminder.html.twig b/templates/emails/login.reminder.html.twig index 7b7fe3810..424ef7527 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')) %}