mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-13 18:14:26 +02:00
Code Issues Releases Wiki Activity

Forum: Fix wrapper styling. More work on experimental 'split' function.

Browse Source
This commit is contained in:
Cameron
2016-05-04 09:13:46 -07:00
parent 8dbe69c291
commit 1ad918eb65
4 changed files with 60 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
e107_plugins/forum/forum_viewtopic.php
View File

@@ -452,14 +452,18 @@ $i = $thread->page;
$sc = e107::getScBatch('view', 'forum');
foreach ($postList as $postInfo)
foreach ($postList as $c => $postInfo)
{
if($postInfo['post_options'])
{
$postInfo['post_options'] = unserialize($postInfo['post_options']);
}
$loop_uid = (int)$postInfo['post_user'];
$tnum = $i;
$i++;
//TODO: Look into fixing this, to limit to a single query per pageload
@@ -467,9 +471,24 @@ foreach ($postList as $postInfo)
$e_hide_query = "SELECT post_id FROM `#forum_post` WHERE (`post_thread` = {$threadId} AND post_user= " . USERID . ' LIMIT 1';
$e_hide_hidden = LAN_FORUM_2008;
$e_hide_allowed = USER;
if ($tnum > 1)
$sc->wrapper('forum_viewtopic/replies'); // default.
if($thread->page ==1 && $c == 0)
{
$postInfo['thread_start'] = true;
$sc->setScVar('postInfo', $postInfo);
$sc->setVars($postInfo); // compatibility
$sc->wrapper('forum_viewtopic/thread');
// $forum_shortcodes = e107::getScBatch('view', 'forum')->setScVar('postInfo', $postInfo)->wrapper('forum/viewtopic');
$forthr = $tp->parseTemplate($FORUMTHREADSTYLE, true, $sc) . "\n";
}
else
{
$postInfo['thread_start'] = false;
$alt = !$alt;
@@ -486,19 +505,14 @@ foreach ($postList as $postInfo)
$_style = (isset($FORUMREPLYSTYLE_ALT) && $alt ? $FORUMREPLYSTYLE_ALT : $FORUMREPLYSTYLE);
$sc->wrapper('forum_viewtopic/replies');
}
// $forum_shortcodes = e107::getScBatch('view', 'forum')->setScVar('postInfo', $postInfo)->wrapper('forum/viewtopic');
$forrep .= $tp->parseTemplate($_style, true, $sc) . "\n";
}
else
{
$postInfo['thread_start'] = true;
$sc->setScVar('postInfo', $postInfo);
$sc->setVars($postInfo); // compatibility
$sc->wrapper('forum_viewtopic/thread');
// $forum_shortcodes = e107::getScBatch('view', 'forum')->setScVar('postInfo', $postInfo)->wrapper('forum/viewtopic');
$forthr = $tp->parseTemplate($FORUMTHREADSTYLE, true, vartrue($sc)) . "\n";
}
}
unset($loop_uid);