aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/functions_privmsgs.php5
-rw-r--r--phpBB/includes/ucp/ucp_pm_viewfolder.php2
2 files changed, 6 insertions, 1 deletions
diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index 834bcfea51..d01d89a7e3 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -208,6 +208,11 @@ function get_folder($user_id, $folder_id = false)
);
}
+ if ($folder_id !== false && !isset($folder[$folder_id]))
+ {
+ trigger_error('UNKNOWN_FOLDER');
+ }
+
return $folder;
}
diff --git a/phpBB/includes/ucp/ucp_pm_viewfolder.php b/phpBB/includes/ucp/ucp_pm_viewfolder.php
index e9c337519a..8c765b1e90 100644
--- a/phpBB/includes/ucp/ucp_pm_viewfolder.php
+++ b/phpBB/includes/ucp/ucp_pm_viewfolder.php
@@ -493,7 +493,7 @@ function get_pm_from($folder_id, $folder, $user_id)
}
else
{
- $pm_count = $folder[$folder_id]['num_messages'];
+ $pm_count = (!empty($folder[$folder_id]['num_messages'])) ? $folder[$folder_id]['num_messages'] : 0;
$sql_limit_time = '';
}