aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-06-07 08:44:12 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-06-07 08:44:12 +0000
commit5f34b5d150fc3fcafd313ff9cadd11d5f7d7aac0 (patch)
tree5115c2f1c7c0164e962dc286ad1dd45ea48985b5 /phpBB/includes
parentc307c5021a63335b43c7eec8b9f3cc593573447f (diff)
downloadforums-5f34b5d150fc3fcafd313ff9cadd11d5f7d7aac0.tar
forums-5f34b5d150fc3fcafd313ff9cadd11d5f7d7aac0.tar.gz
forums-5f34b5d150fc3fcafd313ff9cadd11d5f7d7aac0.tar.bz2
forums-5f34b5d150fc3fcafd313ff9cadd11d5f7d7aac0.tar.xz
forums-5f34b5d150fc3fcafd313ff9cadd11d5f7d7aac0.zip
#2109
git-svn-id: file:///svn/phpbb/trunk@6017 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/functions_privmsgs.php4
-rw-r--r--phpBB/includes/ucp/ucp_pm_viewmessage.php5
2 files changed, 2 insertions, 7 deletions
diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index 25b8ee8fbb..8cb34bafb9 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1101,10 +1101,10 @@ function get_folder_status($folder_id, $folder)
'remaining' => $user->data['message_limit'] - $folder['num_messages'],
'max' => $user->data['message_limit'],
'percent' => ($user->data['message_limit'] > 0) ? round(($folder['num_messages'] / $user->data['message_limit']) * 100) : 100,
-
- 'message' => sprintf($user->lang['FOLDER_STATUS_MSG'], $return['percent'], $return['cur'], $return['max']),
);
+ $return['message'] = sprintf($user->lang['FOLDER_STATUS_MSG'], $return['percent'], $return['cur'], $return['max']);
+
return $return;
}
diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php
index aa32899e28..7261066288 100644
--- a/phpBB/includes/ucp/ucp_pm_viewmessage.php
+++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php
@@ -201,14 +201,9 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
'S_DISPLAY_NOTICE' => $display_notice && $message_row['message_attachment'],
'U_PRINT_PM' => ($config['print_pm'] && $auth->acl_get('u_pm_printpm')) ? "$url&amp;f=$folder_id&amp;p=" . $message_row['msg_id'] . "&amp;view=print" : '',
- 'U_EMAIL_PM' => ($config['email_pm'] && $config['email_enable'] && $auth->acl_get('u_pm_emailpm')) ? '' : '',
'U_FORWARD_PM' => ($config['forward_pm'] && $auth->acl_get('u_pm_forward')) ? "$url&amp;mode=compose&amp;action=forward&amp;f=$folder_id&amp;p=" . $message_row['msg_id'] : '')
);
- /**
- * @todo U_EMAIL_PM add ability to send PM's by email
- */
-
// Display not already displayed Attachments for this post, we already parsed them. ;)
if (isset($attachments) && sizeof($attachments))
{