From 28e8c3ea8587f7dc2d37068a92ebd9d0dfc230c6 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Mon, 26 May 2008 12:05:22 +0000 Subject: [PATCH] merge git-svn-id: file:///svn/phpbb/trunk@8570 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/functions_privmsgs.php | 5 +++++ phpBB/includes/ucp/ucp_pm_viewfolder.php | 2 +- phpBB/styles/prosilver/template/ucp_pm_history.html | 4 ++-- 3 files changed, 8 insertions(+), 3 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 6ba08c36de..0137531154 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 = ''; } diff --git a/phpBB/styles/prosilver/template/ucp_pm_history.html b/phpBB/styles/prosilver/template/ucp_pm_history.html index cadb44e914..5f2994f145 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_history.html +++ b/phpBB/styles/prosilver/template/ucp_pm_history.html @@ -9,7 +9,7 @@
-
+