aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-07-17 15:32:46 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-07-17 15:32:46 +0000
commit99a7ce5bbe92b1313a22db2d8dad51046dca26d9 (patch)
tree7926a5350a86f06e1c0b209d5a16674002750e98 /phpBB/includes
parent1a5e4f446a681b9dbf02951445bb1e2088bd435a (diff)
downloadforums-99a7ce5bbe92b1313a22db2d8dad51046dca26d9.tar
forums-99a7ce5bbe92b1313a22db2d8dad51046dca26d9.tar.gz
forums-99a7ce5bbe92b1313a22db2d8dad51046dca26d9.tar.bz2
forums-99a7ce5bbe92b1313a22db2d8dad51046dca26d9.tar.xz
forums-99a7ce5bbe92b1313a22db2d8dad51046dca26d9.zip
fix the schema files as well as other tiny bugs.
git-svn-id: file:///svn/phpbb/trunk@6190 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/ucp/ucp_pm_viewfolder.php12
-rw-r--r--phpBB/includes/ucp/ucp_pm_viewmessage.php2
2 files changed, 7 insertions, 7 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_viewfolder.php b/phpBB/includes/ucp/ucp_pm_viewfolder.php
index f69f42d393..cafa65354f 100644
--- a/phpBB/includes/ucp/ucp_pm_viewfolder.php
+++ b/phpBB/includes/ucp/ucp_pm_viewfolder.php
@@ -177,8 +177,8 @@ function view_folder($id, $mode, $folder_id, $folder)
{
$row = &$folder_info['rowset'][$message_id];
- $folder_img = ($row['unread']) ? 'folder_new' : 'folder';
- $folder_alt = ($row['unread']) ? 'NEW_MESSAGES' : 'NO_NEW_MESSAGES';
+ $folder_img = ($row['pm_unread']) ? 'folder_new' : 'folder';
+ $folder_alt = ($row['pm_unread']) ? 'NEW_MESSAGES' : 'NO_NEW_MESSAGES';
// Generate all URIs ...
$message_author = '<a href="' . append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=viewprofile&amp;u=' . $row['author_id']) . '">' . $row['username'] . '</a>';
@@ -188,7 +188,7 @@ function view_folder($id, $mode, $folder_id, $folder)
$row_indicator = '';
foreach ($color_rows as $var)
{
- if (($var != 'friend' && $var != 'foe' && $row[$var])
+ if (($var != 'friend' && $var != 'foe' && $row['pm_' . $var])
||
(($var == 'friend' || $var == 'foe') && isset(${$var}[$row['author_id']]) && ${$var}[$row['author_id']]))
{
@@ -213,10 +213,10 @@ function view_folder($id, $mode, $folder_id, $folder)
'PM_IMG' => ($row_indicator) ? $user->img('pm_' . $row_indicator, '') : '',
'ATTACH_ICON_IMG' => ($auth->acl_get('u_pm_download') && $row['message_attachment'] && $config['allow_pm_attach']) ? $user->img('icon_attach', $user->lang['TOTAL_ATTACHMENTS']) : '',
- 'S_PM_DELETED' => ($row['deleted']) ? true : false,
+ 'S_PM_DELETED' => ($row['pm_deleted']) ? true : false,
- 'U_VIEW_PM' => ($row['deleted']) ? '' : $view_message_url,
- 'U_REMOVE_PM' => ($row['deleted']) ? $remove_message_url : '',
+ 'U_VIEW_PM' => ($row['pm_deleted']) ? '' : $view_message_url,
+ 'U_REMOVE_PM' => ($row['pm_deleted']) ? $remove_message_url : '',
'RECIPIENTS' => ($folder_id == PRIVMSGS_OUTBOX || $folder_id == PRIVMSGS_SENTBOX) ? implode(', ', $address_list[$message_id]) : '')
);
}
diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php
index aa2a27b07d..8e1b580571 100644
--- a/phpBB/includes/ucp/ucp_pm_viewmessage.php
+++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php
@@ -23,7 +23,7 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
$author_id = (int) $message_row['author_id'];
// Not able to view message, it was deleted by the sender
- if ($message_row['deleted'])
+ if ($message_row['pm_deleted'])
{
trigger_error('NO_AUTH_READ_REMOVED_MESSAGE');
}