aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--phpBB/includes/bbcode.php2
-rw-r--r--phpBB/viewtopic.php4
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'])
{