Skip to content

Commit

Permalink
[ticket/10537] Removed u_pm_printpm permission
Browse files Browse the repository at this point in the history 
PHPBB3-10537
  • Loading branch information
@imkingdavid
imkingdavid committed Dec 14, 2012
1 parent 1325826 commit c6919e1
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 4 deletions.
1 change: 0 additions & 1 deletion phpBB/develop/add_permissions.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,6 @@
'u_pm_smilies' => array(0, 1),
'u_pm_download' => array(0, 1),
'u_pm_edit' => array(0, 1),
'u_pm_printpm' => array(0, 1),
'u_pm_emailpm' => array(0, 1),
'u_pm_forward' => array(0, 1),
'u_pm_img' => array(0, 1),
Expand Down
2 changes: 1 addition & 1 deletion phpBB/includes/ucp/ucp_pm_viewmessage.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
'S_BBCODE_ALLOWED' => ($bbcode_status) ? 1 : 0,
'S_CUSTOM_FIELDS' => (!empty($cp_row['row'])) ? true : false,

'U_PRINT_PM' => ($config['print_pm'] && $auth->acl_get('u_pm_printpm')) ? "$url&f=$folder_id&p=" . $message_row['msg_id'] . "&view=print" : '',
'U_PRINT_PM' => $config['print_pm'] ? "$url&f=$folder_id&p=" . $message_row['msg_id'] . "&view=print" : '',
'U_FORWARD_PM' => ($config['forward_pm'] && $auth->acl_get('u_sendpm') && $auth->acl_get('u_pm_forward')) ? "$url&mode=compose&action=forward&f=$folder_id&p=" . $message_row['msg_id'] : '',
);

Expand Down
1 change: 0 additions & 1 deletion phpBB/install/schemas/schema_data.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,6 @@ INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_pm_emailpm', 1
INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_pm_flash', 1);
INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_pm_forward', 1);
INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_pm_img', 1);
INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_pm_printpm', 1);
INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_pm_smilies', 1);
INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_readpm', 1);
INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_savedrafts', 1);
Expand Down
1 change: 0 additions & 1 deletion phpBB/language/en/acp/permissions_phpbb.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,6 @@
'acl_u_pm_edit' => array('lang' => 'Can edit own private messages', 'cat' => 'pm'),
'acl_u_pm_forward' => array('lang' => 'Can forward private messages', 'cat' => 'pm'),
'acl_u_pm_emailpm' => array('lang' => 'Can email private messages', 'cat' => 'pm'),
'acl_u_pm_printpm' => array('lang' => 'Can print private messages', 'cat' => 'pm'),
'acl_u_pm_attach' => array('lang' => 'Can attach files in private messages', 'cat' => 'pm'),
'acl_u_pm_download' => array('lang' => 'Can download files in private messages', 'cat' => 'pm'),
'acl_u_pm_bbcode' => array('lang' => 'Can use BBCode in private messages', 'cat' => 'pm'),
Expand Down

0 comments on commit c6919e1

Please sign in to comment.