mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-29 14:48:53 +00:00
Fix r9955 for Bug #49435
(Since $update_message was true in submit_post() the non-parsed text had been entered into the db [because $update_message was false before]) git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9959 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
dedddfabed
commit
5dd85e2323
2 changed files with 5 additions and 4 deletions
|
@ -1621,8 +1621,9 @@ function delete_post($forum_id, $topic_id, $post_id, &$data)
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Submit Post
|
* Submit Post
|
||||||
|
* @todo Split up and create lightweight, simple API for this.
|
||||||
*/
|
*/
|
||||||
function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $update_message = true)
|
function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $update_message = true, $update_search_index = true)
|
||||||
{
|
{
|
||||||
global $db, $auth, $user, $config, $phpEx, $template, $phpbb_root_path;
|
global $db, $auth, $user, $config, $phpEx, $template, $phpbb_root_path;
|
||||||
|
|
||||||
|
@ -2487,7 +2488,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
|
||||||
}
|
}
|
||||||
|
|
||||||
// Index message contents
|
// Index message contents
|
||||||
if ($update_message && $data['enable_indexing'])
|
if ($update_search_index && $data['enable_indexing'])
|
||||||
{
|
{
|
||||||
// Select the search method and do some additional checks to ensure it can actually be utilised
|
// Select the search method and do some additional checks to ensure it can actually be utilised
|
||||||
$search_type = basename($config['search_type']);
|
$search_type = basename($config['search_type']);
|
||||||
|
|
|
@ -1117,8 +1117,8 @@ if ($submit || $preview || $refresh)
|
||||||
$data['topic_replies'] = $post_data['topic_replies'];
|
$data['topic_replies'] = $post_data['topic_replies'];
|
||||||
}
|
}
|
||||||
|
|
||||||
// $update_message indicates two things: 1) update post_text in table 2) update search index
|
// The last parameter tells submit_post if search indexer has to be run
|
||||||
$redirect_url = submit_post($mode, $post_data['post_subject'], $post_data['username'], $post_data['topic_type'], $poll, $data, $update_message || $update_subject);
|
$redirect_url = submit_post($mode, $post_data['post_subject'], $post_data['username'], $post_data['topic_type'], $poll, $data, $update_message, ($update_message || $update_subject) ? true : false);
|
||||||
|
|
||||||
if ($config['enable_post_confirm'] && !$user->data['is_registered'] && in_array($mode, array('quote', 'post', 'reply')))
|
if ($config['enable_post_confirm'] && !$user->data['is_registered'] && in_array($mode, array('quote', 'post', 'reply')))
|
||||||
{
|
{
|
||||||
|
|
Loading…
Add table
Reference in a new issue