diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-07-20 21:45:24 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-07-20 21:45:24 +0000 |
| commit | 73ac6b142375eaff4679a205a6bae537e4d019ac (patch) | |
| tree | 0257aa7d9985d75d5d1cd79d1bd87332e55f303c /phpBB/viewtopic.php | |
| parent | 3f3db8cdaa8a8066ee0f727fe44699a179aca04e (diff) | |
| download | forums-73ac6b142375eaff4679a205a6bae537e4d019ac.tar forums-73ac6b142375eaff4679a205a6bae537e4d019ac.tar.gz forums-73ac6b142375eaff4679a205a6bae537e4d019ac.tar.bz2 forums-73ac6b142375eaff4679a205a6bae537e4d019ac.tar.xz forums-73ac6b142375eaff4679a205a6bae537e4d019ac.zip | |
- some bugfixes
- set ip_check to A.B.C. by default
- display postings in other encodings by default and present link to force the encoding as usual.
git-svn-id: file:///svn/phpbb/trunk@6198 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/viewtopic.php')
| -rw-r--r-- | phpBB/viewtopic.php | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 19a73a83f3..e7c493f112 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -1204,7 +1204,7 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i) // Two situations can prevent a post being display: // i) The poster is on the users ignore list // ii) The post was made in a codepage different from the users - if (isset($row['foe']) && $row['foe']) + if (!empty($row['foe'])) { $template->assign_block_vars('postrow', array( 'S_IGNORE_POST' => true, @@ -1213,21 +1213,9 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i) continue; } - else if ($row['post_encoding'] != $user->lang['ENCODING']) + else if ($row['post_encoding'] != $user->lang['ENCODING'] && $view == 'encoding' && $post_id == $row['post_id']) { - if ($view == 'encoding' && $post_id == $row['post_id']) - { - $force_encoding = $row['post_encoding']; - } - else - { - $template->assign_block_vars('postrow', array( - 'S_IGNORE_POST' => true, - 'L_IGNORE_POST' => sprintf($user->lang['POST_ENCODING'], $row['poster'], '<a href="' . $viewtopic_url . "&p={$row['post_id']}&view=encoding#p{$row['post_id']}" . '">', '</a>')) - ); - - continue; - } + $force_encoding = $row['post_encoding']; } // End signature parsing, only if needed @@ -1383,6 +1371,8 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i) 'ONLINE_IMG' => ($poster_id == ANONYMOUS || !$config['load_onlinetrack']) ? '' : (($user_cache[$poster_id]['online']) ? $user->img('btn_online', 'ONLINE') : $user->img('btn_offline', 'OFFLINE')), 'S_ONLINE' => ($poster_id == ANONYMOUS || !$config['load_onlinetrack']) ? false : (($user_cache[$poster_id]['online']) ? true : false), + 'FORCE_ENCODING' => ($row['post_encoding'] != $user->lang['ENCODING']) ? sprintf($user->lang['POST_ENCODING'], $row['poster'], '<a href="' . $viewtopic_url . "&p={$row['post_id']}&view=encoding#p{$row['post_id']}" . '">', '</a>') : '', + 'U_EDIT' => (($user->data['user_id'] == $poster_id && $auth->acl_get('f_edit', $forum_id) && ($row['post_time'] > time() - ($config['edit_time'] * 60) || !$config['edit_time'])) || $auth->acl_get('m_edit', $forum_id)) ? append_sid("{$phpbb_root_path}posting.$phpEx", "mode=edit&f=$forum_id&p={$row['post_id']}") : '', 'U_QUOTE' => ($auth->acl_get('f_reply', $forum_id)) ? append_sid("{$phpbb_root_path}posting.$phpEx", "mode=quote&f=$forum_id&p={$row['post_id']}") : '', 'U_INFO' => ($auth->acl_get('m_info', $forum_id)) ? append_sid("{$phpbb_root_path}mcp.$phpEx", "i=main&mode=post_details&f=$forum_id&p=" . $row['post_id'], true, $user->session_id) : '', |