mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00
Code Issues Releases Wiki Activity

Merge pull request #5812 from rxu/ticket/16288

Browse Source 
[ticket/16288] PHP 8 compatibility
This commit is contained in:
Marc Alexander
2020-01-09 20:34:53 +01:00
parent eecd0b91c5 f69d9e9559
commit 1b7c42bf53
21 changed files with 110 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
phpBB/includes/ucp/ucp_pm.php
View File

@@ -361,7 +361,7 @@ class ucp_pm
$template->assign_vars(array(
'CUR_FOLDER_ID' => $folder_id,
'CUR_FOLDER_NAME' => $folder_status['folder_name'],
'CUR_FOLDER_NAME' => $folder_status ? $folder_status['folder_name'] : false,
'NUM_NOT_MOVED' => $num_not_moved,
'NUM_REMOVED' => $num_removed,
'RELEASE_MESSAGE_INFO' => sprintf($user->lang['RELEASE_MESSAGES'], '<a href="' . $this->u_action . '&amp;folder=' . $folder_id . '&amp;release=1">', '</a>'),
@@ -384,12 +384,12 @@ class ucp_pm
'S_IN_OUTBOX' => ($folder_id == PRIVMSGS_OUTBOX) ? true : false,
'S_IN_SENTBOX' => ($folder_id == PRIVMSGS_SENTBOX) ? true : false,
'FOLDER_STATUS' => $folder_status['message'],
'FOLDER_MAX_MESSAGES' => $folder_status['max'],
'FOLDER_CUR_MESSAGES' => $folder_status['cur'],
'FOLDER_REMAINING_MESSAGES' => $folder_status['remaining'],
'FOLDER_PERCENT' => $folder_status['percent'])
);
'FOLDER_STATUS' => $folder_status ? $folder_status['message'] : false,
'FOLDER_MAX_MESSAGES' => $folder_status ? $folder_status['max'] : false,
'FOLDER_CUR_MESSAGES' => $folder_status ? $folder_status['cur'] : false,
'FOLDER_REMAINING_MESSAGES' => $folder_status ? $folder_status['remaining'] : false,
'FOLDER_PERCENT' => $folder_status ? $folder_status['percent'] : false,
));
if ($action == 'view_folder')
{
@@ -405,7 +405,7 @@ class ucp_pm
{
$template->assign_vars(array(
'S_VIEW_MESSAGE' => true,
'L_RETURN_TO_FOLDER' => $user->lang('RETURN_TO', $folder_status['folder_name']),
'L_RETURN_TO_FOLDER' => $user->lang('RETURN_TO', $folder_status ? $folder_status['folder_name'] : ''),
'MSG_ID' => $msg_id,
));