diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-04-21 15:10:59 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-04-21 15:10:59 +0000 |
| commit | 91d0c8b3bf41dfed42d8e33595c0e530a431db1c (patch) | |
| tree | 025fdf94609a4875d691f3580c5bee7ef407f9bc /phpBB/includes/ucp/ucp_pm.php | |
| parent | f2ba40f294d8e9e75a3adb78eedb2dc47633043e (diff) | |
| download | forums-91d0c8b3bf41dfed42d8e33595c0e530a431db1c.tar forums-91d0c8b3bf41dfed42d8e33595c0e530a431db1c.tar.gz forums-91d0c8b3bf41dfed42d8e33595c0e530a431db1c.tar.bz2 forums-91d0c8b3bf41dfed42d8e33595c0e530a431db1c.tar.xz forums-91d0c8b3bf41dfed42d8e33595c0e530a431db1c.zip | |
merge again, revisions 8516 to 8525
git-svn-id: file:///svn/phpbb/trunk@8526 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/ucp/ucp_pm.php')
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm.php | 19 |
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) { |