mirror of
https://github.com/e107inc/e107.git
synced 2025-08-03 21:27:25 +02:00
More changes to comply with new shortcode rules
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
<?php
|
<?php
|
||||||
if (!defined('e107_INIT')) { exit; }
|
if (!defined('e107_INIT')) { exit; }
|
||||||
|
|
||||||
class forum_shortcodes extends e_shortcode
|
class plugin_forum_view_shortcodes extends e_shortcode
|
||||||
{
|
{
|
||||||
protected $e107;
|
protected $e107;
|
||||||
|
|
@@ -64,7 +64,7 @@ if(isset($_GET['f']))
|
|||||||
//e107::getScParser();
|
//e107::getScParser();
|
||||||
//require_once (e_PLUGIN . 'forum/forum_shortcodes.php');
|
//require_once (e_PLUGIN . 'forum/forum_shortcodes.php');
|
||||||
//setScVar('forum_shortcodes', 'thread', $thread);
|
//setScVar('forum_shortcodes', 'thread', $thread);
|
||||||
e107::getScBatch('forum', 'forum')->setScVar('thread', $thread);
|
e107::getScBatch('view', 'forum')->setScVar('thread', $thread);
|
||||||
|
|
||||||
$pm_installed = plugInstalled('pm');
|
$pm_installed = plugInstalled('pm');
|
||||||
|
|
||||||
@@ -78,7 +78,7 @@ define('e_PAGETITLE', LAN_01 . ' / ' . $e107->tp->toHTML($thread->threadInfo['fo
|
|||||||
$forum->modArray = $forum->forumGetMods($thread->threadInfo['forum_moderators']);
|
$forum->modArray = $forum->forumGetMods($thread->threadInfo['forum_moderators']);
|
||||||
define('MODERATOR', (USER && $forum->isModerator(USERID)));
|
define('MODERATOR', (USER && $forum->isModerator(USERID)));
|
||||||
|
|
||||||
e107::getScBatch('forum', 'forum')->setScVar('forum', $forum);
|
e107::getScBatch('view', 'forum')->setScVar('forum', $forum);
|
||||||
//var_dump(e107::getScBatch('forum', 'forum'));
|
//var_dump(e107::getScBatch('forum', 'forum'));
|
||||||
|
|
||||||
//setScVar('forum_shortcodes', 'forum', $forum);
|
//setScVar('forum_shortcodes', 'forum', $forum);
|
||||||
@@ -225,13 +225,13 @@ foreach ($postList as $postInfo)
|
|||||||
$_style = (isset($FORUMREPLYSTYLE_ALT) && $alt ? $FORUMREPLYSTYLE_ALT : $FORUMREPLYSTYLE);
|
$_style = (isset($FORUMREPLYSTYLE_ALT) && $alt ? $FORUMREPLYSTYLE_ALT : $FORUMREPLYSTYLE);
|
||||||
}
|
}
|
||||||
// setScVar('forum_shortcodes', 'postInfo', $postInfo);
|
// setScVar('forum_shortcodes', 'postInfo', $postInfo);
|
||||||
e107::getScBatch('forum', 'forum')->setScVar('postInfo', $postInfo);
|
e107::getScBatch('view', 'forum')->setScVar('postInfo', $postInfo);
|
||||||
$forrep .= $e107->tp->parseTemplate($_style, true, $forum_shortcodes) . "\n";
|
$forrep .= $e107->tp->parseTemplate($_style, true, $forum_shortcodes) . "\n";
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$postInfo['thread_start'] = true;
|
$postInfo['thread_start'] = true;
|
||||||
e107::getScBatch('forum', 'forum')->setScVar('postInfo', $postInfo);
|
e107::getScBatch('view', 'forum')->setScVar('postInfo', $postInfo);
|
||||||
$forthr = $e107->tp->parseTemplate($FORUMTHREADSTYLE, true, $forum_shortcodes) . "\n";
|
$forthr = $e107->tp->parseTemplate($FORUMTHREADSTYLE, true, $forum_shortcodes) . "\n";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user