makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-10 13:28:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.2.x'

Browse source 
* 3.2.x:
  [ticket/14530] Only generate text again if sig was parsed for storage
  [ticket/14530] Add accidentally removed sig_parsed flag
This commit is contained in:
Tristan Darricau 2016-03-25 11:14:33 +01:00
commit dfd7426be4
3 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
phpBB/includes/acp/acp_users.php
View file

@ -2073,7 +2073,10 @@ class acp_users
// Replace "error" strings with their real, localised form // Replace "error" strings with their real, localised form
$error = array_map(array($user, 'lang'), $error); $error = array_map(array($user, 'lang'), $error);
$decoded_message = generate_text_for_edit($signature, $bbcode_uid, $bbcode_bitfield); if ($request->is_set_post('preview'))
{
$decoded_message = generate_text_for_edit($signature, $bbcode_uid, $bbcode_bitfield);
}
/** @var \phpbb\controller\helper $controller_helper */ /** @var \phpbb\controller\helper $controller_helper */
$controller_helper = $phpbb_container->get('controller.helper'); $controller_helper = $phpbb_container->get('controller.helper');

5
phpBB/includes/ucp/ucp_profile.php
View file

@ -544,7 +544,10 @@ class ucp_profile
// Replace "error" strings with their real, localised form // Replace "error" strings with their real, localised form
$error = array_map(array($user, 'lang'), $error); $error = array_map(array($user, 'lang'), $error);
$decoded_message = generate_text_for_edit($signature, $bbcode_uid, $bbcode_bitfield); if ($request->is_set_post('preview'))
{
$decoded_message = generate_text_for_edit($signature, $bbcode_uid, $bbcode_flags);
}
/** @var \phpbb\controller\helper $controller_helper */ /** @var \phpbb\controller\helper $controller_helper */
$controller_helper = $phpbb_container->get('controller.helper'); $controller_helper = $phpbb_container->get('controller.helper');

1
phpBB/viewtopic.php
View file

@ -1624,6 +1624,7 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i)
{ {
$parse_flags = ($user_cache[$poster_id]['sig_bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES; $parse_flags = ($user_cache[$poster_id]['sig_bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES;
$user_cache[$poster_id]['sig'] = generate_text_for_display($user_cache[$poster_id]['sig'], $user_cache[$poster_id]['sig_bbcode_uid'], $user_cache[$poster_id]['sig_bbcode_bitfield'], $parse_flags, true); $user_cache[$poster_id]['sig'] = generate_text_for_display($user_cache[$poster_id]['sig'], $user_cache[$poster_id]['sig_bbcode_uid'], $user_cache[$poster_id]['sig_bbcode_bitfield'], $parse_flags, true);
$user_cache[$poster_id]['sig_parsed'] = true;
} }
// Parse the message and subject // Parse the message and subject