diff options
| author | Fyorl <gaelreth@gmail.com> | 2012-08-17 16:16:02 +0100 |
|---|---|---|
| committer | Fyorl <gaelreth@gmail.com> | 2012-08-17 16:16:02 +0100 |
| commit | 53aadd60a66c813db90aa1d54e649384679f2614 (patch) | |
| tree | 056e0d4dac2a645e5f176c2ea9cc8991d2a592ba | |
| parent | 884a213d55bfbe06b3c3d63f4596a9a52801a399 (diff) | |
| download | forums-53aadd60a66c813db90aa1d54e649384679f2614.tar forums-53aadd60a66c813db90aa1d54e649384679f2614.tar.gz forums-53aadd60a66c813db90aa1d54e649384679f2614.tar.bz2 forums-53aadd60a66c813db90aa1d54e649384679f2614.tar.xz forums-53aadd60a66c813db90aa1d54e649384679f2614.zip | |
[feature/attach-dl] Renamed $post_id to $post_msg_id
PHPBB3-11042
| -rw-r--r-- | phpBB/download/file.php | 14 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_viewmessage.php | 2 | ||||
| -rw-r--r-- | phpBB/viewtopic.php | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/phpBB/download/file.php b/phpBB/download/file.php index 701405f3d4..5563e34cda 100644 --- a/phpBB/download/file.php +++ b/phpBB/download/file.php @@ -135,7 +135,7 @@ require($phpbb_root_path . 'includes/functions_download' . '.' . $phpEx); $download_id = request_var('id', 0); $topic_id = $request->variable('topic_id', 0); -$post_id = $request->variable('post_id', 0); +$post_msg_id = $request->variable('post_msg_id', 0); $archive = $request->variable('archive', '.tar'); $mode = request_var('mode', ''); $thumbnail = request_var('t', false); @@ -156,10 +156,10 @@ if ($download_id) // Attachment id (only 1 attachment) $sql_where = "attach_id = $download_id"; } -else if ($post_id) +else if ($post_msg_id) { // Post id or private message id (multiple attachments) - $sql_where = "post_msg_id = $post_id AND is_orphan = 0"; + $sql_where = "post_msg_id = $post_msg_id AND is_orphan = 0"; } else if ($topic_id) { @@ -319,19 +319,19 @@ else $archive = '.tar'; } - if ($post_id) + if ($post_msg_id) { if ($attachment['in_message']) { $sql = 'SELECT message_subject AS attach_subject FROM ' . PRIVMSGS_TABLE . " - WHERE msg_id = $post_id"; + WHERE msg_id = $post_msg_id"; } else { $sql = 'SELECT post_subject AS attach_subject, forum_id FROM ' . POSTS_TABLE . " - WHERE post_id = $post_id"; + WHERE post_id = $post_msg_id"; } } else @@ -352,7 +352,7 @@ else } $clean_name = phpbb_download_clean_filename($row['attach_subject']); - $suffix = '_' . (($post_id) ? $post_id : $topic_id) . '_' . $clean_name; + $suffix = '_' . (($post_msg_id) ? $post_msg_id : $topic_id) . '_' . $clean_name; $archive_name = 'attachments' . $suffix; $store_name = 'att_' . time() . '_' . unique_id(); diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php index 16fa7d630e..27111f9c9a 100644 --- a/phpBB/includes/ucp/ucp_pm_viewmessage.php +++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php @@ -283,7 +283,7 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row) // Display not already displayed Attachments for this post, we already parsed them. ;) if (isset($attachments) && sizeof($attachments)) { - $methods = phpbb_gen_download_links('post_id', $msg_id, $phpbb_root_path, $phpEx); + $methods = phpbb_gen_download_links('post_msg_id', $msg_id, $phpbb_root_path, $phpEx); foreach ($methods as $method) { $template->assign_block_vars('dl_method', $method); diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 9f044e0a89..41566219b9 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -1606,7 +1606,7 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i) ); } - $methods = phpbb_gen_download_links('post_id', $row['post_id'], $phpbb_root_path, $phpEx); + $methods = phpbb_gen_download_links('post_msg_id', $row['post_id'], $phpbb_root_path, $phpEx); foreach ($methods as $method) { $template->assign_block_vars('postrow.dl_method', $method); |