diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-11-26 14:55:18 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-11-26 14:55:18 +0000 |
| commit | 6583f90b8d082096ebd9cfc0588730dd36efb077 (patch) | |
| tree | 36d01de359aafeabe6daa571ea2c0a40da41ab14 /phpBB/includes/functions.php | |
| parent | 5c5330c29d3e19eab804d9dbfd0261e6459e00b8 (diff) | |
| download | forums-6583f90b8d082096ebd9cfc0588730dd36efb077.tar forums-6583f90b8d082096ebd9cfc0588730dd36efb077.tar.gz forums-6583f90b8d082096ebd9cfc0588730dd36efb077.tar.bz2 forums-6583f90b8d082096ebd9cfc0588730dd36efb077.tar.xz forums-6583f90b8d082096ebd9cfc0588730dd36efb077.zip | |
- bug fixes for #5618, #5588 and #5584
- remove messenger->reset() calls (they are already performed on sending)
git-svn-id: file:///svn/phpbb/trunk@6660 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 001702a39e..bf1883e96f 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2433,8 +2433,8 @@ function parse_inline_attachments(&$text, &$attachments, &$update_count, $forum_ include("{$phpbb_root_path}includes/functions_display.$phpEx"); } - $attachment_tpl = display_attachments($forum_id, NULL, $attachments, $update_count, false, true); - $tpl_size = sizeof($attachment_tpl); + $attachments = display_attachments($forum_id, NULL, $attachments, $update_count, false, true); + $tpl_size = sizeof($attachments); $unset_tpl = array(); @@ -2447,7 +2447,7 @@ function parse_inline_attachments(&$text, &$attachments, &$update_count, $forum_ $index = ($config['display_order']) ? ($tpl_size-($matches[1][$num] + 1)) : $matches[1][$num]; $replace['from'][] = $matches[0][$num]; - $replace['to'][] = (isset($attachment_tpl[$index])) ? $attachment_tpl[$index] : sprintf($user->lang['MISSING_INLINE_ATTACHMENT'], $matches[2][array_search($index, $matches[1])]); + $replace['to'][] = (isset($attachments[$index])) ? $attachments[$index] : sprintf($user->lang['MISSING_INLINE_ATTACHMENT'], $matches[2][array_search($index, $matches[1])]); $unset_tpl[] = $index; } |