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

Forum fixes

Browse Source
This commit is contained in:
Cameron
2013-04-18 12:43:22 -07:00
parent 4d46c4bd4c
commit e01c75e58b
4 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_plugins/forum/forum_viewforum.php
View File

@@ -778,7 +778,7 @@ function newthreadjump($url)
<button class="btn btn-primary dropdown-toggle" data-toggle="dropdown"> <button class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
<span class="caret"></span> <span class="caret"></span>
</button> </button>
<ul class="dropdown-menu"> <ul class="dropdown-menu pull-right">
'; ';
foreach($jumpList as $key => $val) foreach($jumpList as $key => $val)

4
e107_plugins/forum/forum_viewtopic.php
View File

@@ -286,7 +286,7 @@ function forumbuttons($thread)
<button class="btn btn-primary dropdown-toggle" data-toggle="dropdown"> <button class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
<span class="caret"></span> <span class="caret"></span>
</button> </button>
<ul class="dropdown-menu"> <ul class="dropdown-menu pull-right">
'; ';
foreach($options as $key => $val) foreach($options as $key => $val)
@@ -344,8 +344,6 @@ foreach ($postList as $postInfo)
$e_hide_hidden = FORLAN_HIDDEN; $e_hide_hidden = FORLAN_HIDDEN;
$e_hide_allowed = USER; $e_hide_allowed = USER;
if ($tnum > 1) if ($tnum > 1)
{ {
$postInfo['thread_start'] = false; $postInfo['thread_start'] = false;

10
e107_plugins/forum/shortcodes/batch/view_shortcodes.php
View File

@@ -51,7 +51,15 @@ class plugin_forum_view_shortcodes extends e_shortcode
return $this->postInfo['post_id']; return $this->postInfo['post_id'];
} }
/* Preferred - as {POST} may conflict with other shortcodes */
function sc_thread_text()
{
return $this->sc_post();
}
/**
* @DEPRECATED - use {THREAD_TEXT}
*/
function sc_post() function sc_post()
{ {
$emote = (isset($this->postInfo['post_options']['no_emote']) ? ',emotes_off' : ''); $emote = (isset($this->postInfo['post_options']['no_emote']) ? ',emotes_off' : '');
@@ -467,7 +475,7 @@ class plugin_forum_view_shortcodes extends e_shortcode
Options Options
<span class="caret"></span> <span class="caret"></span>
</button> </button>
<ul class="dropdown-menu left">'; <ul class="dropdown-menu pull-right">';
$text .= "<li><a href='".e_HTTP."email.php?plugin:forum.".$this->postInfo['post_thread']."'>".FORLAN_101."</a></li>"; $text .= "<li><a href='".e_HTTP."email.php?plugin:forum.".$this->postInfo['post_thread']."'>".FORLAN_101."</a></li>";

2
e107_plugins/forum/templates/forum_viewtopic_template.php
View File

@@ -343,7 +343,7 @@ $FORUM_VIEWTOPIC_TEMPLATE['thread'] = "
</div> </div>
<div class='span9 '> <div class='span9 '>
{POLL} {POLL}
{POST} {THREAD_TEXT}
{ATTACHMENTS} {ATTACHMENTS}
</div> </div>
</div> </div>