aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGraham Eames <grahamje@users.sourceforge.net>2006-10-21 15:46:23 +0000
committerGraham Eames <grahamje@users.sourceforge.net>2006-10-21 15:46:23 +0000
commit7470dcf709c7b0e9957414af6cacc9f99e61932b (patch)
tree07e1c190477612b4a1e35f46fafa4e6590bb9cc9 /phpBB/ucp.php
parent#4876 (diff)
downloadphpbb-7470dcf709c7b0e9957414af6cacc9f99e61932b.tar.gz
phpbb-7470dcf709c7b0e9957414af6cacc9f99e61932b.tar.bz2
phpbb-7470dcf709c7b0e9957414af6cacc9f99e61932b.zip
Move outputting of TO box since it's only relevant to one module and this will ensure it is displayed however that module is loaded [#4866]
git-svn-id: file:///svn/phpbb/trunk@6515 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/ucp.php')
-rwxr-xr-xphpBB/ucp.php28
1 files changed, 0 insertions, 28 deletions
diff --git a/phpBB/ucp.php b/phpBB/ucp.php
index 037d577029..f0758e752e 100755
--- a/phpBB/ucp.php
+++ b/phpBB/ucp.php
@@ -283,34 +283,6 @@ while ($row = $db->sql_fetchrow($result))
}
$db->sql_freeresult($result);
-// Output PM_TO box if message composing
-if ($mode == 'compose' && $auth->acl_get('u_sendpm') && request_var('action', '') != 'edit')
-{
- if ($config['allow_mass_pm'] && $auth->acl_get('u_masspm'))
- {
- $sql = 'SELECT group_id, group_name, group_type
- FROM ' . GROUPS_TABLE . '
- WHERE group_type NOT IN (' . GROUP_HIDDEN . ', ' . GROUP_CLOSED . ')
- AND group_receive_pm = 1
- ORDER BY group_type DESC';
- $result = $db->sql_query($sql);
-
- $group_options = '';
- while ($row = $db->sql_fetchrow($result))
- {
- $group_options .= '<option' . (($row['group_type'] == GROUP_SPECIAL) ? ' class="blue"' : '') . ' value="' . $row['group_id'] . '">' . (($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['group_name']] : $row['group_name']) . '</option>';
- }
- $db->sql_freeresult($result);
- }
-
- $template->assign_vars(array(
- 'S_SHOW_PM_BOX' => true,
- 'S_ALLOW_MASS_PM' => ($config['allow_mass_pm'] && $auth->acl_get('u_masspm')) ? true : false,
- 'S_GROUP_OPTIONS' => ($config['allow_mass_pm'] && $auth->acl_get('u_masspm')) ? $group_options : '',
- 'U_SEARCH_USER' => append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&amp;form=post&amp;field=username_list'))
- );
-}
-
// Instantiate module system and generate list of available modules
$module->list_modules('ucp');