mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-04 21:57:51 +02:00
Code Issues Releases Wiki Activity

Issue #371 - forum template parsing issue.

Browse Source
This commit is contained in:
Cameron
2013-06-02 16:16:38 -07:00
parent 2d8ba837af
commit 023d0f6047
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
e107_plugins/forum/forum_post.php
View File

@@ -81,7 +81,7 @@ define('MODERATOR', USER && $forum->isModerator(USERID));
require_once(e_HANDLER.'ren_help.php');
//e107::getScBatch('view', 'forum'); //XXX FIXME Conflicting shortcode names. Find a solution without renaming them.
e107::getScBatch('post', 'forum')->setScVar('forum', $forum)->setScVar('threadInfo', vartrue($threadInfo));
$sc = e107::getScBatch('post', 'forum')->setScVar('forum', $forum)->setScVar('threadInfo', vartrue($threadInfo));
$gen = new convert;
$fp = new floodprotect;
@@ -520,7 +520,7 @@ if($action == 'rp')
$FORUMPOST = $FORUMPOST_REPLY;
}
e107::lan('forum','English_front');
$text = $tp->parseTemplate($FORUMPOST, true);
$text = $tp->parseTemplate($FORUMPOST, true, $sc);
// -------------------------------------------------------------------------------------------------------------------------------------------------------------

4
e107_plugins/forum/forum_viewtopic.php
View File

@@ -358,13 +358,13 @@ foreach ($postList as $postInfo)
$_style = (isset($FORUMREPLYSTYLE_ALT) && $alt ? $FORUMREPLYSTYLE_ALT : $FORUMREPLYSTYLE);
}
e107::getScBatch('view', 'forum')->setScVar('postInfo', $postInfo);
$forum_shortcodes = e107::getScBatch('view', 'forum')->setScVar('postInfo', $postInfo);
$forrep .= $tp->parseTemplate($_style, true, $forum_shortcodes) . "\n";
}
else
{
$postInfo['thread_start'] = true;
e107::getScBatch('view', 'forum')->setScVar('postInfo', $postInfo);
$forum_shortcodes = e107::getScBatch('view', 'forum')->setScVar('postInfo', $postInfo);
$forthr = $tp->parseTemplate($FORUMTHREADSTYLE, true, vartrue($forum_shortcodes)) . "\n";
}
}