diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2003-05-20 13:24:23 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2003-05-20 13:24:23 +0000 |
| commit | b48d7492a207f1d0ba4cd1435f189cf9e1c54301 (patch) | |
| tree | 8e91fffd9ac1555d39c44a15a2a1ff00e961d487 /phpBB/viewtopic.php | |
| parent | 0b5852208840ee41d7f883d58cd1887b2da46539 (diff) | |
| download | forums-b48d7492a207f1d0ba4cd1435f189cf9e1c54301.tar forums-b48d7492a207f1d0ba4cd1435f189cf9e1c54301.tar.gz forums-b48d7492a207f1d0ba4cd1435f189cf9e1c54301.tar.bz2 forums-b48d7492a207f1d0ba4cd1435f189cf9e1c54301.tar.xz forums-b48d7492a207f1d0ba4cd1435f189cf9e1c54301.zip | |
Enable view limiting functions ... Ashe, not sure if this is compatible with your thinking for bbcode but it seems the "logical" way to handle disabling of bbcode/flash in this manner. Fixed issue with automatic url handling of local links
git-svn-id: file:///svn/phpbb/trunk@4028 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/viewtopic.php')
| -rw-r--r-- | phpBB/viewtopic.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 52941fdb9a..3135033c22 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -712,7 +712,7 @@ do else { $user_sig = ''; - if ($row['enable_sig'] && $row['user_sig'] && $config['allow_sig']) + if ($row['enable_sig'] && $row['user_sig'] && $config['allow_sig'] && $user->data['user_allowsigs']) { $user_sig = $row['user_sig']; $bbcode_bitfield |= $row['user_sig_bbcode_bitfield']; @@ -760,7 +760,7 @@ do ); - if ($row['user_avatar_type'] && $auth->acl_get('u_setavatar')) + if ($row['user_avatar_type'] && $auth->acl_get('u_setavatar') && $user->data['user_allowavatars']) { switch ($row['user_avatar_type']) { @@ -796,7 +796,7 @@ do } } - if ((!empty($row['user_viewemail']) || $auth->acl_get('m_', $forum_id)) && $config['email_enable']) + if ((!empty($row['user_allow_viewemail']) || $auth->acl_get('m_', $forum_id)) && $config['email_enable']) { $email_url = ($config['board_email_form']) ? "memberlist.$phpEx$SID&mode=email&u=" . $poster_id : 'mailto:' . $row['user_email']; $user_cache[$poster_id]['email_img'] = '<a href="' . $email_url . '">' . $user->img('btn_email', $user->lang['SEND_EMAIL']) . '</a>'; @@ -1023,7 +1023,7 @@ foreach ($rowset as $key => $row) // If we allow users to disable display of emoticons // we'll need an appropriate check and preg_replace here - $message = (empty($config['allow_smilies'])) ? preg_replace('#<!\-\- s(.*?) \-\-><img src="\{SMILE_PATH\}\/.*? \/><!\-\- s\1 \-\->#', '\1', $message) : str_replace('<img src="{SMILE_PATH}', '<img src="' . $config['smilies_path'], $message); + $message = (empty($config['allow_smilies']) || !$user->data['user_viewsmilies']) ? preg_replace('#<!\-\- s(.*?) \-\-><img src="\{SMILE_PATH\}\/.*? \/><!\-\- s\1 \-\->#', '\1', $message) : str_replace('<img src="{SMILE_PATH}', '<img src="' . $config['smilies_path'], $message); // Highlight active words (primarily for search) |