aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/message_parser.php
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2010-03-02 01:05:40 +0100
committerNils Adermann <naderman@naderman.de>2010-03-02 01:05:40 +0100
commitf0eb18fffd11a97383c8ccf2ae7d2838939f09e2 (patch)
tree70790196713789f9cbe4609f9e841f7e69bb6f00 /phpBB/includes/message_parser.php
parent021c186be91095397d4e76801738373989360a52 (diff)
parentac5995551ba941b2cb5d98cc86ffe921bedee200 (diff)
downloadforums-f0eb18fffd11a97383c8ccf2ae7d2838939f09e2.tar
forums-f0eb18fffd11a97383c8ccf2ae7d2838939f09e2.tar.gz
forums-f0eb18fffd11a97383c8ccf2ae7d2838939f09e2.tar.bz2
forums-f0eb18fffd11a97383c8ccf2ae7d2838939f09e2.tar.xz
forums-f0eb18fffd11a97383c8ccf2ae7d2838939f09e2.zip
Merge commit 'release-3.0.6-RC2'
Diffstat (limited to 'phpBB/includes/message_parser.php')
-rw-r--r--phpBB/includes/message_parser.php15
1 files changed, 3 insertions, 12 deletions
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index 72c101f7a3..3df582d640 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -1345,7 +1345,7 @@ class parse_message extends bbcode_firstpass
/**
* Parse Attachments
*/
- function parse_attachments($form_name, $mode, $forum_id, $submit, $preview, $refresh, $is_message = false, $post_msg_id = 0, $topic_id = 0)
+ function parse_attachments($form_name, $mode, $forum_id, $submit, $preview, $refresh, $is_message = false)
{
global $config, $auth, $user, $phpbb_root_path, $phpEx, $db;
@@ -1498,25 +1498,16 @@ class parse_message extends bbcode_firstpass
'filesize' => $filedata['filesize'],
'filetime' => $filedata['filetime'],
'thumbnail' => $filedata['thumbnail'],
- 'is_orphan' => ($post_msg_id) ? 0 : 1,
+ 'is_orphan' => 1,
'in_message' => ($is_message) ? 1 : 0,
'poster_id' => $user->data['user_id'],
);
- if ($post_msg_id)
- {
- $sql_ary['post_msg_id'] = $post_msg_id;
- if ($topic_id)
- {
- $sql_ary['topic_id'] = $topic_id;
- }
- }
-
$db->sql_query('INSERT INTO ' . ATTACHMENTS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary));
$new_entry = array(
'attach_id' => $db->sql_nextid(),
- 'is_orphan' => ($post_msg_id) ? 0 : 1,
+ 'is_orphan' => 1,
'real_filename' => $filedata['real_filename'],
'attach_comment'=> $this->filename_data['filecomment'],
);