mirror of
https://github.com/e107inc/e107.git
synced 2025-04-13 09:01:59 +02:00
Patch for the issue #2506
This commit is contained in:
parent
392a4f1785
commit
863e1afee0
@ -390,7 +390,7 @@ foreach ($forumList['parents'] as $parent)
|
||||
|
||||
$sc->setVars($parent);
|
||||
$sc->wrapper('forum/main/parent');
|
||||
$forum_string .= $tp->parseTemplate($FORUM_MAIN_PARENT, false, $sc);
|
||||
$forum_string .= $tp->parseTemplate($FORUM_MAIN_PARENT, true, $sc);
|
||||
if (!count($forumList['forums'][$parent['forum_id']]))
|
||||
{
|
||||
$text .= "<td colspan='5' style='text-align:center' class='forumheader3'>".LAN_FORUM_0068."</td>";
|
||||
@ -424,7 +424,7 @@ foreach ($forumList['parents'] as $parent)
|
||||
if (isset($FORUM_MAIN_PARENT_END))
|
||||
{
|
||||
//-- $forum_string .= $tp->simpleParse($FORUM_MAIN_PARENT_END, $pVars);
|
||||
$forum_string .= $tp->parseTemplate($FORUM_MAIN_PARENT_END, false, $sc);
|
||||
$forum_string .= $tp->parseTemplate($FORUM_MAIN_PARENT_END, true, $sc);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -629,20 +629,20 @@ if (e_QUERY == 'new')
|
||||
|
||||
//-- $forum_newstring .= $tp->simpleParse($FORUM_NEWPOSTS_MAIN, $nVars);
|
||||
$sc->setVars($thread);
|
||||
$forum_newstring .= $tp->parseTemplate($FORUM_NEWPOSTS_MAIN, false, $sc);
|
||||
$forum_newstring .= $tp->parseTemplate($FORUM_NEWPOSTS_MAIN, true, $sc);
|
||||
}
|
||||
|
||||
if (empty($newThreadList))
|
||||
{
|
||||
//-- $nVars->NEWSPOSTNAME = LAN_FORUM_0029;
|
||||
//-- $forum_newstring = $tp->simpleParse($FORUM_NEWPOSTS_MAIN, $nVars);
|
||||
$forum_newstring = $tp->parseTemplate($FORUM_NEWPOSTS_MAIN, false, $sc);
|
||||
$forum_newstring = $tp->parseTemplate($FORUM_NEWPOSTS_MAIN, true, $sc);
|
||||
|
||||
}
|
||||
//-- $forum_new_start = $tp->simpleParse($FORUM_NEWPOSTS_START, $nVars);
|
||||
//-- $forum_new_end = $tp->simpleParse($FORUM_NEWPOSTS_END, $nVars);
|
||||
$forum_new_start = $tp->parseTemplate($FORUM_NEWPOSTS_START, false, $sc);
|
||||
$forum_new_end = $tp->parseTemplate($FORUM_NEWPOSTS_END, false, $sc);
|
||||
$forum_new_start = $tp->parseTemplate($FORUM_NEWPOSTS_START, true, $sc);
|
||||
$forum_new_end = $tp->parseTemplate($FORUM_NEWPOSTS_END, true, $sc);
|
||||
|
||||
if ($forum->prefs->get('enclose'))
|
||||
{
|
||||
@ -664,11 +664,11 @@ $breadarray = array(
|
||||
|
||||
//-- $forum_main_start = $tp->simpleParse($FORUM_MAIN_START, $fVars);
|
||||
$sc->wrapper('forum/main/start');
|
||||
$forum_main_start = $tp->parseTemplate($FORUM_MAIN_START, false, $sc);
|
||||
$forum_main_start = $tp->parseTemplate($FORUM_MAIN_START, true, $sc);
|
||||
//-- $forum_main_end = $tp->simpleParse($FORUM_MAIN_END, $fVars);
|
||||
|
||||
$sc->wrapper('forum/main/end');
|
||||
$forum_main_end = $tp->parseTemplate($FORUM_MAIN_END, false, $sc);
|
||||
$forum_main_end = $tp->parseTemplate($FORUM_MAIN_END, true, $sc);
|
||||
|
||||
if ($forum->prefs->get('enclose'))
|
||||
{
|
||||
|
@ -559,9 +559,9 @@ if($container_only)
|
||||
|
||||
//var_dump ($FORUM_VIEW_START);
|
||||
// var_dump ($FORUM_VIEW_SUB);
|
||||
$forum_view_start = $tp->parseTemplate($FORUM_VIEW_START_CONTAINER.$FORUM_VIEW_START, false, $sc);
|
||||
$forum_view_forum = $tp->parseTemplate($forum_view_forum, false, $sc);
|
||||
$forum_view_end = $tp->parseTemplate($FORUM_VIEW_END.$FORUM_VIEW_END_CONTAINER, false, $sc);
|
||||
$forum_view_start = $tp->parseTemplate($FORUM_VIEW_START_CONTAINER.$FORUM_VIEW_START, true, $sc);
|
||||
$forum_view_forum = $tp->parseTemplate($forum_view_forum, true, $sc);
|
||||
$forum_view_end = $tp->parseTemplate($FORUM_VIEW_END.$FORUM_VIEW_END_CONTAINER, true, $sc);
|
||||
|
||||
//$forum_view_start .= "<hr><hr>FVARS FORUM<hr><hr>".$tp->simpleParse($FORUM_VIEW_START, $fVars);
|
||||
//$forum_view_end = $tp->simpleParse($FORUM_VIEW_END, $fVars);
|
||||
@ -569,7 +569,7 @@ $forum_view_end = $tp->parseTemplate($FORUM_VIEW_END.$FORUM_VIEW_END_CONTAINER,
|
||||
if ($forum->prefs->get('enclose'))
|
||||
{
|
||||
// $forum_view_subs????
|
||||
$caption = varset($FORUM_VIEW_CAPTION) ? $tp->parseTemplate($FORUM_VIEW_CAPTION, TRUE, $sc) : $forum->prefs->get('title');
|
||||
$caption = varset($FORUM_VIEW_CAPTION) ? $tp->parseTemplate($FORUM_VIEW_CAPTION, true, $sc) : $forum->prefs->get('title');
|
||||
|
||||
$ns->tablerender($caption, $forum_view_start.$forum_view_subs.$forum_view_forum.$forum_view_end, array('forum_viewforum', 'main1'));
|
||||
}
|
||||
|
@ -616,7 +616,7 @@ require_once (HEADERF);
|
||||
|
||||
if ($forum->prefs->get('enclose'))
|
||||
{
|
||||
$forumTitle = empty($FORUMCAPTION) ? e107::pref('forum','title', LAN_PLUGIN_FORUM_NAME) : $tp->parseTemplate($FORUMCAPTION, TRUE, $sc);
|
||||
$forumTitle = empty($FORUMCAPTION) ? e107::pref('forum','title', LAN_PLUGIN_FORUM_NAME) : $tp->parseTemplate($FORUMCAPTION, true, $sc);
|
||||
$ns->tablerender($forumTitle, $mes->render().$forumstring, array('forum_viewtopic', 'main'));
|
||||
}
|
||||
else
|
||||
|
@ -111,7 +111,7 @@ class forum_newforumposts_menu // plugin folder + menu name (without the .php)
|
||||
|
||||
$sc = e107::getScBatch('view', 'forum')->setScVar('param',$param);
|
||||
|
||||
$list = $tp->parseTemplate($template['start'],true);
|
||||
$list = $tp->parseTemplate($template['start'], true);
|
||||
|
||||
while($row = $sql->fetch())
|
||||
{
|
||||
@ -119,7 +119,7 @@ class forum_newforumposts_menu // plugin folder + menu name (without the .php)
|
||||
|
||||
$sc->setScVar('postInfo', $row);
|
||||
$sc->setVars($row);
|
||||
$list .= $tp->parseTemplate($template['item'],false,$sc);
|
||||
$list .= $tp->parseTemplate($template['item'], true, $sc);
|
||||
|
||||
|
||||
/*
|
||||
@ -189,7 +189,7 @@ class forum_newforumposts_menu // plugin folder + menu name (without the .php)
|
||||
|
||||
|
||||
|
||||
$list .= $tp->parseTemplate($template['end'],true);
|
||||
$list .= $tp->parseTemplate($template['end'], true);
|
||||
|
||||
|
||||
$text = $list;
|
||||
|
Loading…
x
Reference in New Issue
Block a user