diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2004-09-04 19:32:23 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2004-09-04 19:32:23 +0000 |
| commit | 57b188b7afa66b68ef75ee69bc06cd8f14b3fed1 (patch) | |
| tree | 676d8f5348e2c790664127dd651774543bd9bf75 /phpBB/includes/ucp/ucp_pm_options.php | |
| parent | 68d73caefcf084f5f523ee7a47b84112dedd4e21 (diff) | |
| download | forums-57b188b7afa66b68ef75ee69bc06cd8f14b3fed1.tar forums-57b188b7afa66b68ef75ee69bc06cd8f14b3fed1.tar.gz forums-57b188b7afa66b68ef75ee69bc06cd8f14b3fed1.tar.bz2 forums-57b188b7afa66b68ef75ee69bc06cd8f14b3fed1.tar.xz forums-57b188b7afa66b68ef75ee69bc06cd8f14b3fed1.zip | |
my turn to break the forum (and at least pm's are no longer working - will not last long). HARRRR
git-svn-id: file:///svn/phpbb/trunk@4978 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/ucp/ucp_pm_options.php')
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_options.php | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_options.php b/phpBB/includes/ucp/ucp_pm_options.php index 699452fe69..69e802b4da 100644 --- a/phpBB/includes/ucp/ucp_pm_options.php +++ b/phpBB/includes/ucp/ucp_pm_options.php @@ -212,7 +212,17 @@ function message_options($id, $mode, $global_privmsgs_rules, $global_rule_condit $db->sql_freeresult($result); $s_full_folder_options = $s_to_folder_options = $s_folder_options = ''; - + + if ($user->data['user_full_folder'] == FULL_FOLDER_NONE) + { + // -3 here to let the correct folder id be selected + $to_folder_id = $config['full_folder_action']-3; + } + else + { + $to_folder_id = $user->data['user_full_folder']; + } + foreach ($folder as $folder_id => $folder_ary) { $s_full_folder_options .= '<option value="' . $folder_id . '"' . (($user->data['user_full_folder'] == $folder_id) ? ' selected="selected"' : '') . '>' . $folder_ary['folder_name'] . ' (' . $folder_ary['message_status'] . ')</option>'; |