diff options
| author | Henry Sudhof <kellanved@phpbb.com> | 2008-08-29 11:53:11 +0000 |
|---|---|---|
| committer | Henry Sudhof <kellanved@phpbb.com> | 2008-08-29 11:53:11 +0000 |
| commit | 57ec5805df1d396a52d1431903c8174fdb7569ad (patch) | |
| tree | 4f15a268e4caa1d0b43c443bc0307ffd38141430 /phpBB | |
| parent | 73da6084d01eb806589c829d4461cc1412740fcb (diff) | |
| download | forums-57ec5805df1d396a52d1431903c8174fdb7569ad.tar forums-57ec5805df1d396a52d1431903c8174fdb7569ad.tar.gz forums-57ec5805df1d396a52d1431903c8174fdb7569ad.tar.bz2 forums-57ec5805df1d396a52d1431903c8174fdb7569ad.tar.xz forums-57ec5805df1d396a52d1431903c8174fdb7569ad.zip | |
Merging R8795
git-svn-id: file:///svn/phpbb/trunk@8796 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_viewfolder.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_viewfolder.php b/phpBB/includes/ucp/ucp_pm_viewfolder.php index 25e1497ca6..2c010ca642 100644 --- a/phpBB/includes/ucp/ucp_pm_viewfolder.php +++ b/phpBB/includes/ucp/ucp_pm_viewfolder.php @@ -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 |