More fixes for CPFs. I believe the wizard should now work for all types, even with several languages. Testing is encouraged.

git-svn-id: file:///svn/phpbb/trunk@7941 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Henry Sudhof 2007-07-24 17:18:05 +00:00
parent f813c7ad0d
commit 88250b0857
2 changed files with 5 additions and 6 deletions

View file

@ -269,14 +269,14 @@ p a {
<li>[Fix] Finer error conditions for sending IM messages (Bugs #13681, #13683)</li> <li>[Fix] Finer error conditions for sending IM messages (Bugs #13681, #13683)</li>
<li>[Fix] Add a confirmation for log deletion in the MCP (Bug #13693)</li> <li>[Fix] Add a confirmation for log deletion in the MCP (Bug #13693)</li>
<li>[Fix] Do not erase ranks and avatars when changing default groups (Bugs #13701, #13697)</li> <li>[Fix] Do not erase ranks and avatars when changing default groups (Bugs #13701, #13697)</li>
<li>[Fix] Limit author searches to firstpost, if selected (Bug #13579)</li> <li>[Fix] Limit author searches to firstpost, if selected (Bug #13579)</li>
<li>[Fix] store Date custom profile field defaults on multi-lingual boards </li> <li>[Fix] store Date custom profile field defaults on multi-lingual boards </li>
<li>[Fix] Properly resync user post counts for users that have no posts (Bug #13581)</li> <li>[Fix] Properly resync user post counts for users that have no posts (Bug #13581)</li>
<li>[Fix] Do not require space after , in smiley pak files (Bug #13647)</li> <li>[Fix] Do not require space after , in smiley pak files (Bug #13647)</li>
<li>[Fix] Properly display the subscribe link in topic and forum display for Oracle (Bug #13583)</li> <li>[Fix] Properly display the subscribe link in topic and forum display for Oracle (Bug #13583)</li>
<li>[Change] Add version number to ACP index (Bug #13703)</li> <li>[Change] Add version number to ACP index (Bug #13703)</li>
<li>[Fix] Quick-Mod tools now retaining the start parameter (Bug #13537)</li> <li>[Fix] Quick-Mod tools now retaining the start parameter (Bug #13537)</li>
<li>[Fix] Several fixes for custom profile fields on multi-lingual boards </li>
</ul> </ul>
</div> </div>

View file

@ -931,10 +931,9 @@ class acp_profile
foreach ($options as $field => $field_type) foreach ($options as $field => $field_type)
{ {
$value = ($action == 'create') ? utf8_normalize_nfc(request_var('l_' . $field, array(0 => ''), true)) : $cp->vars['l_' . $field]; $value = ($action == 'create') ? utf8_normalize_nfc(request_var('l_' . $field, array(0 => ''), true)) : $cp->vars['l_' . $field];
if ($field == 'lang_options') if ($field == 'lang_options')
{ {
$var = ($action == 'create' || !is_array($cp->vars['l_lang_options'][$lang_id])) ? $cp->vars['lang_options'] : $cp->vars['lang_options'][$lang_id]; $var = (!isset($cp->vars['l_lang_options'][$lang_id]) || !is_array($cp->vars['l_lang_options'][$lang_id])) ? $cp->vars['lang_options'] : $cp->vars['l_lang_options'][$lang_id];
switch ($field_type) switch ($field_type)
{ {
@ -949,10 +948,10 @@ class acp_profile
break; break;
case 'optionfield': case 'optionfield':
$value = ((isset($value[$lang_id])) ? ((is_array($value[$lang_id])) ? implode("\n", $value[$lang_id]) : $value[$lang_id]) : implode("\n", $var));
$lang_options[$lang_id]['fields'][$field] = array( $lang_options[$lang_id]['fields'][$field] = array(
'TITLE' => $user->lang['CP_' . strtoupper($field)], 'TITLE' => $user->lang['CP_' . strtoupper($field)],
'FIELD' => '<dd><textarea name="l_' . $field . '[' . $lang_id . ']" rows="7" cols="80">' . ((isset($value[$lang_id])) ? implode("\n", $value[$lang_id]) : implode("\n", $var)) . '</textarea></dd>' 'FIELD' => '<dd><textarea name="l_' . $field . '[' . $lang_id . ']" rows="7" cols="80">' . $value . '</textarea></dd>'
); );
break; break;
} }