diff options
author | Paul S. Owen <psotfx@users.sourceforge.net> | 2003-05-20 13:35:48 +0000 |
---|---|---|
committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2003-05-20 13:35:48 +0000 |
commit | f3f3b4489742b462256c5e3490b707568cd597bf (patch) | |
tree | 80418c7bf66c7e26edee4a69da5b01579d67226d | |
parent | b48d7492a207f1d0ba4cd1435f189cf9e1c54301 (diff) | |
download | forums-f3f3b4489742b462256c5e3490b707568cd597bf.tar forums-f3f3b4489742b462256c5e3490b707568cd597bf.tar.gz forums-f3f3b4489742b462256c5e3490b707568cd597bf.tar.bz2 forums-f3f3b4489742b462256c5e3490b707568cd597bf.tar.xz forums-f3f3b4489742b462256c5e3490b707568cd597bf.zip |
This version tends to do what it was supposed to do ... I guess users will prefer this ...
git-svn-id: file:///svn/phpbb/trunk@4029 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r-- | phpBB/includes/bbcode.php | 2 | ||||
-rw-r--r-- | phpBB/viewtopic.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php index 3564fc04bf..d8f7c73790 100644 --- a/phpBB/includes/bbcode.php +++ b/phpBB/includes/bbcode.php @@ -245,7 +245,7 @@ class bbcode ); break; case 11: - if ($user->data['user_viewimages']) + if ($user->data['user_viewflash']) { $this->bbcode_cache[$bbcode_id] = array( 'preg' => array( diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 3135033c22..0e68906ed8 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'] && $user->data['user_allowsigs']) + if ($row['enable_sig'] && $row['user_sig'] && $config['allow_sig'] && $user->data['user_viewsigs']) { $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') && $user->data['user_allowavatars']) + if ($row['user_avatar_type'] && $auth->acl_get('u_setavatar') && $user->data['user_viewavatars']) { switch ($row['user_avatar_type']) { |