diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2003-05-11 16:21:35 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2003-05-11 16:21:35 +0000 |
| commit | 4d1def879aef2b97a2dfe65c13f2c3c8e6b53aff (patch) | |
| tree | 477b69dc84a7ec7efc9c8de15b7b28b952320ec7 /phpBB/viewtopic.php | |
| parent | 30fd2486d82d50fecd4ba5ec6b81eebc4fcfdf49 (diff) | |
| download | forums-4d1def879aef2b97a2dfe65c13f2c3c8e6b53aff.tar forums-4d1def879aef2b97a2dfe65c13f2c3c8e6b53aff.tar.gz forums-4d1def879aef2b97a2dfe65c13f2c3c8e6b53aff.tar.bz2 forums-4d1def879aef2b97a2dfe65c13f2c3c8e6b53aff.tar.xz forums-4d1def879aef2b97a2dfe65c13f2c3c8e6b53aff.zip | |
a few updates, added #539865 and #694413.
git-svn-id: file:///svn/phpbb/trunk@4005 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/viewtopic.php')
| -rw-r--r-- | phpBB/viewtopic.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index a480ca961f..d0084dd9bb 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -1045,9 +1045,9 @@ foreach ($rowset as $key => $row) // Editing information - if (!empty($row['post_edit_count'])) + if (!empty($row['post_edit_count']) && $config['display_last_edited']) { - $l_edit_time_total = ($row['post_edit_count'] == 1) ? $user->lang['Edited_time_total'] : $user->lang['Edited_times_total']; + $l_edit_time_total = ($row['post_edit_count'] == 1) ? $user->lang['EDITED_TIME_TOTAL'] : $user->lang['EDITED_TIMES_TOTAL']; $l_edited_by = '<br /><br />' . sprintf($l_edit_time_total, $row['poster'], $user->format_date($row['post_edit_time']), $row['post_edit_count']); } @@ -1236,7 +1236,7 @@ foreach ($rowset as $key => $row) // Images, but display Thumbnail // NOTE: If you want to use the download.php everytime an thumnmail is displayed inlined, use this line: // $thumb_source = $phpbb_root_path . 'download.' . $phpEx . $SID . '&id=' . $attachment['attach_id'] . '&thumb=1'; - if (!empty($config['allow_ftp_upload']) && trim($config['upload_dir']) == '') + if (!empty($config['use_ftp_upload']) && trim($config['upload_dir']) == '') { $thumb_source = $phpbb_root_path . "download.$phpEx$SID&id=" . $attachment['attach_id'] . '&thumb=1'; } |