mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-31 03:40:37 +02:00
Code Issues Releases Wiki Activity

Merge pull request #3251 from SimSync/fix_3087

Browse Source 
fixes #3087 Missing forum id prevented pagination
This commit is contained in:
Cameron
2018-07-04 17:44:28 -07:00
committed by GitHub
parent 23e97e058c ed17213698
commit 77edce4da4
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
e107_plugins/forum/forum_viewforum.php
View File

@@ -270,11 +270,14 @@ if ($pages)
{ {
if(strpos($FORUM_VIEW_START, 'THREADPAGES') !== false || strpos($FORUM_VIEW_END, 'THREADPAGES') !== false) 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"; $parms = "total={$pages}&type=page&current={$page}&url=".$url."&caption=off";
$fVars->THREADPAGES = $tp->parseTemplate("{NEXTPREV={$parms}}"); $fVars->THREADPAGES = $tp->parseTemplate("{NEXTPREV={$parms}}");
--*/ --*/
$forumSCvars['parms'] = "total={$pages}&type=page&current={$page}&url=".$url."&caption=off"; $forumSCvars['parms'] = "total={$pages}&type=page&current={$page}&url=".$url."&caption=off";
//-- ?????????? unset $ulrparms???? //-- ?????????? unset $ulrparms????
unset($urlparms); unset($urlparms);