diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-07-06 16:46:53 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-07-06 16:46:53 +0000 |
| commit | 462dc69b8e8568f4656675b31b99a31ad98e1331 (patch) | |
| tree | 80887b741981fbb7ae508039ae8da66e5e918310 /phpBB/includes/acp/acp_users.php | |
| parent | 2b531a279f267642582b275dc3f215367e6a5396 (diff) | |
| download | forums-462dc69b8e8568f4656675b31b99a31ad98e1331.tar forums-462dc69b8e8568f4656675b31b99a31ad98e1331.tar.gz forums-462dc69b8e8568f4656675b31b99a31ad98e1331.tar.bz2 forums-462dc69b8e8568f4656675b31b99a31ad98e1331.tar.xz forums-462dc69b8e8568f4656675b31b99a31ad98e1331.zip | |
some bugfixes
git-svn-id: file:///svn/phpbb/trunk@6149 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp/acp_users.php')
| -rw-r--r-- | phpBB/includes/acp/acp_users.php | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index f8b289da5e..f6fe02e617 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -1505,6 +1505,7 @@ class acp_users case 'sig': include_once($phpbb_root_path . 'includes/functions_posting.' . $phpEx); + include_once($phpbb_root_path . 'includes/functions_display.' . $phpEx); $enable_bbcode = ($config['allow_sig_bbcode']) ? request_var('enable_bbcode', $this->optionget($user_row, 'bbcode')) : false; $enable_smilies = ($config['allow_sig_smilies']) ? request_var('enable_smilies', $this->optionget($user_row, 'smilies')) : false; @@ -1576,9 +1577,14 @@ class acp_users 'L_SIGNATURE_EXPLAIN' => sprintf($user->lang['SIGNATURE_EXPLAIN'], $config['max_sig_chars']), 'S_BBCODE_ALLOWED' => $config['allow_sig_bbcode'], - 'S_SMILIES_ALLOWED' => $config['allow_sig_smilies'],) + 'S_SMILIES_ALLOWED' => $config['allow_sig_smilies'], + 'S_BBCODE_IMG' => ($config['allow_sig_img']) ? true : false, + 'S_BBCODE_FLASH' => ($config['allow_sig_flash']) ? true : false) ); + // Assigning custom bbcodes + display_custom_bbcodes(); + break; case 'attach': @@ -1808,7 +1814,7 @@ class acp_users $s_group_options = ''; while ($row = $db->sql_fetchrow($result)) { - if ($config['coppa_hide_groups'] && in_array($row['group_name'], array('INACTIVE_COPPA', 'REGISTERED_COPPA'))) + if (!$config['coppa_enable'] && in_array($row['group_name'], array('INACTIVE_COPPA', 'REGISTERED_COPPA'))) { continue; } |