aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2019-05-01 22:20:04 +0200
committerMarc Alexander <admin@m-a-styles.de>2019-05-01 22:20:04 +0200
commitb2f3f72eca85eb46a02ac64e8fbd1d937a4827d6 (patch)
tree1d31780413c636d5fc9d5f38d632fa74506b4c02 /phpBB
parenteb1896e6f7f55e3bd65d0be8dfd8fb310bd4e8cd (diff)
parent70b7777743a53a7f11e6b4c72663e4686d4677f9 (diff)
downloadforums-b2f3f72eca85eb46a02ac64e8fbd1d937a4827d6.tar
forums-b2f3f72eca85eb46a02ac64e8fbd1d937a4827d6.tar.gz
forums-b2f3f72eca85eb46a02ac64e8fbd1d937a4827d6.tar.bz2
forums-b2f3f72eca85eb46a02ac64e8fbd1d937a4827d6.tar.xz
forums-b2f3f72eca85eb46a02ac64e8fbd1d937a4827d6.zip
Merge pull request #5579 from VSEphpbb/ticket/16037
[ticket/16037] Fix UCP PM ViewFolder PHP Notice error
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/includes/ucp/ucp_pm_viewfolder.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_viewfolder.php b/phpBB/includes/ucp/ucp_pm_viewfolder.php
index a0b535d683..09e7bf4d7c 100644
--- a/phpBB/includes/ucp/ucp_pm_viewfolder.php
+++ b/phpBB/includes/ucp/ucp_pm_viewfolder.php
@@ -138,9 +138,9 @@ function view_folder($id, $mode, $folder_id, $folder)
$row_indicator = '';
foreach ($color_rows as $var)
{
- if (($var != 'friend' && $var != 'foe' && $row['pm_' . $var])
+ if (($var !== 'friend' && $var !== 'foe' && $row[($var === 'message_reported') ? $var : "pm_{$var}"])
||
- (($var == 'friend' || $var == 'foe') && isset(${$var}[$row['author_id']]) && ${$var}[$row['author_id']]))
+ (($var === 'friend' || $var === 'foe') && isset(${$var}[$row['author_id']]) && ${$var}[$row['author_id']]))
{
$row_indicator = $var;
break;