From 7fc3f406d964cb6c5c9a5d99e80a72a16efbf7e2 Mon Sep 17 00:00:00 2001 From: rica-carv Date: Thu, 30 Jun 2016 14:56:30 +0100 Subject: [PATCH] Pull to solve missing pagination & quickreply shortcode Pull to solve missing pagination & quickreply shortcode --- e107_plugins/forum/forum_viewtopic.php | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/e107_plugins/forum/forum_viewtopic.php b/e107_plugins/forum/forum_viewtopic.php index d3c0f8e68..27a103266 100644 --- a/e107_plugins/forum/forum_viewtopic.php +++ b/e107_plugins/forum/forum_viewtopic.php @@ -473,6 +473,10 @@ $i = $thread->page; //---- Moved upwards, to enclose $tVars... //---- $sc = e107::getScBatch('view', 'forum'); + $mes = e107::getMessage(); +// $sc->setVars($thread->threadInfo); +//--->$forend = $tp->simpleParse($FORUMEND, $tVars); +$forend = $tp->parseTemplate($FORUMEND, true, $sc); foreach ($postList as $c => $postInfo) @@ -538,6 +542,7 @@ foreach ($postList as $c => $postInfo) } unset($loop_uid); +/*----> if ($forum->checkPerm($thread->threadInfo['thread_forum_id'], 'post') && $thread->threadInfo['thread_active']) { //XXX Show only on the last page?? @@ -578,11 +583,14 @@ if ($forum->checkPerm($thread->threadInfo['thread_forum_id'], 'post') && $thread $tVars->QUICKREPLY = $forum_quickreply; } } +<----*/ - +/*---> $mes = e107::getMessage(); -$forend = $tp->simpleParse($FORUMEND, $tVars); - + $sc->setVars($thread->threadInfo); +//--->$forend = $tp->simpleParse($FORUMEND, $tVars); +$forend = $tp->parseTemplate($FORUMEND, true, $sc); +<---*/ $forumstring = $forstr . $forthr . vartrue($forrep) . $forend; //If last post came after USERLV and not yet marked as read, mark the thread id as read