aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/styles/subsilver2/template
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2014-05-02 21:23:58 +0200
committerNils Adermann <naderman@naderman.de>2014-05-02 21:23:58 +0200
commit0fc6b6ac369e56ce648c808447ce8ec311f91a89 (patch)
treeebd074f95e93e2859d392bcdd7296b0c19c38414 /phpBB/styles/subsilver2/template
parent03594b64438464ba7f234ce38d3344561bc0a66b (diff)
parent5b0b0d7c66ecd6f5d77726b635c3d6625caf56d7 (diff)
downloadforums-0fc6b6ac369e56ce648c808447ce8ec311f91a89.tar
forums-0fc6b6ac369e56ce648c808447ce8ec311f91a89.tar.gz
forums-0fc6b6ac369e56ce648c808447ce8ec311f91a89.tar.bz2
forums-0fc6b6ac369e56ce648c808447ce8ec311f91a89.tar.xz
forums-0fc6b6ac369e56ce648c808447ce8ec311f91a89.zip
Merge remote-tracking branch 'github-vse/ticket/12254' into develop-ascraeus
* github-vse/ticket/12254: [ticket/12254] Add subsilver2 support for cookie storage instead of SID [ticket/12254] Use a cookie instead of SID to store language selection [ticket/12254] No longer need to add change_lang to the URL params [ticket/12254] Use 'language' instead of 'set_lang' as the variable name [ticket/12254] Persist set_lang after reg only if changed from default [ticket/12254] Add set_lang var changes to subsilver2 files [ticket/12254] Use new set_lang var to avoid conflict with change_lang [ticket/12254] Stop using deprecated request_var in user class [ticket/12254] Better language switching on registration page
Diffstat (limited to 'phpBB/styles/subsilver2/template')
-rw-r--r--phpBB/styles/subsilver2/template/ucp_agreement.html1
-rw-r--r--phpBB/styles/subsilver2/template/ucp_register.html1
2 files changed, 2 insertions, 0 deletions
diff --git a/phpBB/styles/subsilver2/template/ucp_agreement.html b/phpBB/styles/subsilver2/template/ucp_agreement.html
index 054d25282f..3afe6e89a0 100644
--- a/phpBB/styles/subsilver2/template/ucp_agreement.html
+++ b/phpBB/styles/subsilver2/template/ucp_agreement.html
@@ -10,6 +10,7 @@
*/
function change_language(lang_iso)
{
+ document.cookie = '{COOKIE_NAME}_lang=' + lang_iso + '; path={COOKIE_PATH}';
document.forms['register'].change_lang.value = lang_iso;
document.forms['register'].submit();
}
diff --git a/phpBB/styles/subsilver2/template/ucp_register.html b/phpBB/styles/subsilver2/template/ucp_register.html
index 3392c557a2..1d55b952e5 100644
--- a/phpBB/styles/subsilver2/template/ucp_register.html
+++ b/phpBB/styles/subsilver2/template/ucp_register.html
@@ -7,6 +7,7 @@
*/
function change_language(lang_iso)
{
+ document.cookie = '{COOKIE_NAME}_lang=' + lang_iso + '; path={COOKIE_PATH}';
document.forms['register'].change_lang.value = lang_iso;
document.forms['register'].submit.click();
}