1
0
mirror of https://github.com/e107inc/e107.git synced 2025-04-21 05:02:02 +02:00

Merge pull request #3251 from SimSync/fix_3087

fixes #3087 Missing forum id prevented pagination
This commit is contained in:
Cameron 2018-07-04 17:44:28 -07:00 committed by GitHub
commit 77edce4da4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -270,11 +270,14 @@ if ($pages)
{
if(strpos($FORUM_VIEW_START, 'THREADPAGES') !== false || strpos($FORUM_VIEW_END, 'THREADPAGES') !== false)
{
$url = e107::url('forum','forum',$forumInfo, array('query'=>array('p'=>'[FROM]')));
/*--
// issue #3087 url need to be decoded first (because the [FROM] get's encoded in url())
// and to encode the full url to not loose the id param when being used in the $forumSCvars['parms']
$url = rawurlencode(rawurldecode(e107::url('forum','forum',$forumInfo, array('query'=>array('p'=>'[FROM]')))));
/*--
$parms = "total={$pages}&type=page&current={$page}&url=".$url."&caption=off";
$fVars->THREADPAGES = $tp->parseTemplate("{NEXTPREV={$parms}}");
--*/
--*/
$forumSCvars['parms'] = "total={$pages}&type=page&current={$page}&url=".$url."&caption=off";
//-- ?????????? unset $ulrparms????
unset($urlparms);