aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/ucp
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/includes/ucp')
-rw-r--r--phpBB/includes/ucp/ucp_pm.php19
1 files changed, 2 insertions, 17 deletions
diff --git a/phpBB/includes/ucp/ucp_pm.php b/phpBB/includes/ucp/ucp_pm.php
index 46b23efb54..b4ac0c11da 100644
--- a/phpBB/includes/ucp/ucp_pm.php
+++ b/phpBB/includes/ucp/ucp_pm.php
@@ -129,15 +129,7 @@ class ucp_pm
break;
case 'options':
- $sql = 'SELECT group_message_limit
- FROM ' . GROUPS_TABLE . '
- WHERE group_id = ' . $user->data['group_id'];
- $result = $db->sql_query($sql, 3600);
- $message_limit = (int) $db->sql_fetchfield('group_message_limit');
- $db->sql_freeresult($result);
-
- $user->data['message_limit'] = (!$message_limit) ? $config['pm_max_msgs'] : $message_limit;
-
+ set_user_message_limit();
get_folder($user->data['user_id']);
include($phpbb_root_path . 'includes/ucp/ucp_pm_options.' . $phpEx);
@@ -168,14 +160,7 @@ class ucp_pm
case 'view':
- $sql = 'SELECT group_message_limit
- FROM ' . GROUPS_TABLE . '
- WHERE group_id = ' . $user->data['group_id'];
- $result = $db->sql_query($sql, 3600);
- $message_limit = (int) $db->sql_fetchfield('group_message_limit');
- $db->sql_freeresult($result);
-
- $user->data['message_limit'] = (!$message_limit) ? $config['pm_max_msgs'] : $message_limit;
+ set_user_message_limit();
if ($folder_specified)
{