diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-05-26 12:05:22 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-05-26 12:05:22 +0000 |
| commit | 28e8c3ea8587f7dc2d37068a92ebd9d0dfc230c6 (patch) | |
| tree | c93c4a117c364426cb8394c6f2004041bddd2b79 | |
| parent | 0c1fa73423b230401eff5c1aeeeffeaefd97a1ac (diff) | |
| download | forums-28e8c3ea8587f7dc2d37068a92ebd9d0dfc230c6.tar forums-28e8c3ea8587f7dc2d37068a92ebd9d0dfc230c6.tar.gz forums-28e8c3ea8587f7dc2d37068a92ebd9d0dfc230c6.tar.bz2 forums-28e8c3ea8587f7dc2d37068a92ebd9d0dfc230c6.tar.xz forums-28e8c3ea8587f7dc2d37068a92ebd9d0dfc230c6.zip | |
merge
git-svn-id: file:///svn/phpbb/trunk@8570 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/includes/functions_privmsgs.php | 5 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_viewfolder.php | 2 | ||||
| -rw-r--r-- | 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 @@ <div class="post <!-- IF history_row.S_ROW_COUNT is even -->bg1<!-- ELSE -->bg2<!-- ENDIF -->"> <div class="inner"><span class="corners-top"><span></span></span> - <div class="postbody" id="pr{history_row.U_MSG_ID}"> + <div class="postbody" id="pr{history_row.MSG_ID}"> <!-- IF history_row.U_QUOTE --> <ul class="profile-icons"> <li class="quote-icon"><a href="{history_row.U_QUOTE}" title="{L_QUOTE} {history_row.MESSAGE_AUTHOR}"><span>{L_QUOTE} {history_row.MESSAGE_AUTHOR}</span></a></li> @@ -19,7 +19,7 @@ <h3><a href="{history_row.U_VIEW_MESSAGE}" <!-- IF history_row.S_CURRENT_MSG -->class="current"<!-- ENDIF -->>{history_row.SUBJECT}</a></h3> <p class="author<!-- IF history_row.S_CURRENT_MSG --> current<!-- ENDIF -->">{history_row.MINI_POST_IMG} {L_SENT_AT}: <strong>{history_row.SENT_DATE}</strong><br /> {L_MESSAGE_BY_AUTHOR} {history_row.MESSAGE_AUTHOR_FULL}</p> - <div class="content<!-- IF history_row.S_CURRENT_MSG --> current<!-- ENDIF -->" id="message_{history_row.U_MSG_ID}"> + <div class="content<!-- IF history_row.S_CURRENT_MSG --> current<!-- ENDIF -->" id="message_{history_row.MSG_ID}"> {history_row.MESSAGE} </div> </div> |