mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-06 16:56:44 +02:00
okie, using array_merge. :D
fixed: admin_prune added: prune topics last viewed at... (only admin_prune ATM) moved: delete_attachments to functions_admin git-svn-id: file:///svn/phpbb/trunk@4482 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
@@ -1760,8 +1760,8 @@ function submit_post($mode, $message, $subject, $username, $topic_type, $bbcode_
|
||||
'post_attachment' => (sizeof($filename_data['physical_filename'])) ? 1 : 0,
|
||||
'bbcode_bitfield' => $data['bbcode_bitfield'],
|
||||
'bbcode_uid' => $bbcode_uid,
|
||||
'post_edit_locked' => $data['post_edit_locked']
|
||||
));
|
||||
'post_edit_locked' => $data['post_edit_locked'])
|
||||
);
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -1783,11 +1783,11 @@ function submit_post($mode, $message, $subject, $username, $topic_type, $bbcode_
|
||||
|
||||
if (!empty($poll['poll_options']))
|
||||
{
|
||||
$sql_data['topic']['sql'] += array(
|
||||
$sql_data['topic']['sql'] = array_merge($sql_data['topic']['sql'], array(
|
||||
'poll_title' => $poll['poll_title'],
|
||||
'poll_start' => ($poll['poll_start']) ? $poll['poll_start'] : $current_time,
|
||||
'poll_max_options' => $poll['poll_max_options'],
|
||||
'poll_length' => $poll['poll_length'] * 86400
|
||||
'poll_length' => $poll['poll_length'] * 86400)
|
||||
);
|
||||
}
|
||||
|
||||
@@ -1846,8 +1846,8 @@ function submit_post($mode, $message, $subject, $username, $topic_type, $bbcode_
|
||||
|
||||
$data['topic_id'] = $db->sql_nextid();
|
||||
|
||||
$sql_data['post']['sql'] += array(
|
||||
'topic_id' => $data['topic_id']
|
||||
$sql_data['post']['sql'] = array_merge($sql_data['post']['sql'], array(
|
||||
'topic_id' => $data['topic_id'])
|
||||
);
|
||||
unset($sql_data['topic']['sql']);
|
||||
}
|
||||
@@ -1857,8 +1857,8 @@ function submit_post($mode, $message, $subject, $username, $topic_type, $bbcode_
|
||||
{
|
||||
if ($post_mode == 'reply')
|
||||
{
|
||||
$sql_data['post']['sql'] += array(
|
||||
'topic_id' => $data['topic_id']
|
||||
$sql_data['post']['sql'] = array_merge($sql_data['post']['sql'], array(
|
||||
'topic_id' => $data['topic_id'])
|
||||
);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user