diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2016-03-25 11:14:33 +0100 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2016-03-25 11:14:33 +0100 |
| commit | 28f0c3457c48205ee6b7a62b878418f797f8649f (patch) | |
| tree | 53a6b06a9e3cb256eea23150aaa000c68f35132a | |
| parent | 4212c304ab47537141e45e2ac1442410c83e800c (diff) | |
| parent | a66ec6eccf31b36f29c57fa9c29eafe531933606 (diff) | |
| download | forums-28f0c3457c48205ee6b7a62b878418f797f8649f.tar forums-28f0c3457c48205ee6b7a62b878418f797f8649f.tar.gz forums-28f0c3457c48205ee6b7a62b878418f797f8649f.tar.bz2 forums-28f0c3457c48205ee6b7a62b878418f797f8649f.tar.xz forums-28f0c3457c48205ee6b7a62b878418f797f8649f.zip | |
Merge pull request #4239 from marc1706/ticket/14530
[ticket/14530] Only generate text again if sig was parsed for storage
* marc1706/ticket/14530:
[ticket/14530] Only generate text again if sig was parsed for storage
[ticket/14530] Add accidentally removed sig_parsed flag
| -rw-r--r-- | phpBB/includes/acp/acp_users.php | 5 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_profile.php | 5 | ||||
| -rw-r--r-- | phpBB/viewtopic.php | 1 |
3 files changed, 9 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index 0ee6452ada..76b6275954 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -2073,7 +2073,10 @@ class acp_users // Replace "error" strings with their real, localised form $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 */ $controller_helper = $phpbb_container->get('controller.helper'); diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php index 4ac8e0f17d..5c0b792f6f 100644 --- a/phpBB/includes/ucp/ucp_profile.php +++ b/phpBB/includes/ucp/ucp_profile.php @@ -544,7 +544,10 @@ class ucp_profile // Replace "error" strings with their real, localised form $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 */ $controller_helper = $phpbb_container->get('controller.helper'); diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 65ba3fcd36..7757120817 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -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; $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 |