Merging R8795

git-svn-id: file:///svn/phpbb/trunk@8796 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Henry Sudhof 2008-08-29 11:53:11 +00:00
parent 73da6084d0
commit 57ec5805df

View file

@ -511,7 +511,7 @@ function get_pm_from($folder_id, $folder, $user_id)
'S_TOPIC_ICONS' => ($config['enable_pm_icons']) ? true : false,
'U_POST_NEW_TOPIC' => ($auth->acl_get('u_sendpm')) ? append_sid('ucp', 'i=pm&mode=compose') : '',
'S_PM_ACTION' => append_sid('ucp', "i=pm&mode=view&action=view_folder&f=$folder_id"))
'S_PM_ACTION' => append_sid('ucp', "i=pm&mode=view&action=view_folder&f=$folder_id" . (($start !== 0) ? "&start=$start" : '')))
);
// Grab all pm data