aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTristan Darricau <tristan.darricau@sensiolabs.com>2015-10-08 15:45:46 +0200
committerTristan Darricau <tristan.darricau@sensiolabs.com>2015-10-08 15:45:46 +0200
commit73f9e7936a266b174b65812af4d2a6ea648db048 (patch)
treeda84b882f5bf61ab95ea8981ce7328023b339a00
parent6e90311550657acf20630f66906e19ee4ba7ff2d (diff)
parent5b7b0894e0a54c117ebf43bd8206e4b3ab8953d8 (diff)
downloadforums-73f9e7936a266b174b65812af4d2a6ea648db048.tar
forums-73f9e7936a266b174b65812af4d2a6ea648db048.tar.gz
forums-73f9e7936a266b174b65812af4d2a6ea648db048.tar.bz2
forums-73f9e7936a266b174b65812af4d2a6ea648db048.tar.xz
forums-73f9e7936a266b174b65812af4d2a6ea648db048.zip
Merge branch '3.1.x'
* 3.1.x: [ticket/13934] Add enctype clause for profile fields
-rw-r--r--phpBB/adm/style/acp_profile.html2
-rw-r--r--phpBB/adm/style/acp_users_profile.html2
-rw-r--r--phpBB/styles/prosilver/template/ucp_register.html2
3 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/adm/style/acp_profile.html b/phpBB/adm/style/acp_profile.html
index 3ce2d9471d..07718846cc 100644
--- a/phpBB/adm/style/acp_profile.html
+++ b/phpBB/adm/style/acp_profile.html
@@ -17,7 +17,7 @@
</div>
<!-- ENDIF -->
- <form id="add_profile_field" method="post" action="{U_ACTION}">
+ <form id="add_profile_field" method="post" action="{U_ACTION}"{S_FORM_ENCTYPE}>
<!-- IF S_STEP_ONE -->
diff --git a/phpBB/adm/style/acp_users_profile.html b/phpBB/adm/style/acp_users_profile.html
index 573534fc95..9296638ff6 100644
--- a/phpBB/adm/style/acp_users_profile.html
+++ b/phpBB/adm/style/acp_users_profile.html
@@ -1,4 +1,4 @@
- <form id="user_profile" method="post" action="{U_ACTION}">
+ <form id="user_profile" method="post" action="{U_ACTION}"{S_FORM_ENCTYPE}>
<fieldset>
<legend>{L_USER_PROFILE}</legend>
diff --git a/phpBB/styles/prosilver/template/ucp_register.html b/phpBB/styles/prosilver/template/ucp_register.html
index fafd0cce00..655c0fc48c 100644
--- a/phpBB/styles/prosilver/template/ucp_register.html
+++ b/phpBB/styles/prosilver/template/ucp_register.html
@@ -14,7 +14,7 @@
// ]]>
</script>
-<form method="post" action="{S_UCP_ACTION}" id="register">
+<form id="register" method="post" action="{S_UCP_ACTION}"{S_FORM_ENCTYPE}>
<div class="panel">
<div class="inner">