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

Merge pull request #2143 from rica-carv/rica-carv-patch-3

Browse Source 
Forum: Fixes #2141
This commit is contained in:
Cameron
2016-12-13 13:30:06 -08:00
committed by GitHub
parent 28305c9953 322a23e4b0
commit 05e2228db8
1 changed files with 27 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
e107_plugins/forum/forum_post.php
View File

@@ -373,20 +373,25 @@ class forum_post_handler
global $FORUMPOST, $subjectbox, $userbox, $poll_form, $fileattach, $fileattach_alert; // needed for BC. global $FORUMPOST, $subjectbox, $userbox, $poll_form, $fileattach, $fileattach_alert; // needed for BC.
$FORUM_POST_TEMPLATE = array(); //-- $FORUM_POST_TEMPLATE = array();
$FORUM_POSTED_TEMPLATE = array(); //-- $FORUM_POSTED_TEMPLATE = array();
$FORUMREPLYPOSTED = ''; $FORUMREPLYPOSTED = '';
$FORUMTHREADPOSTED = ''; $FORUMTHREADPOSTED = '';
$FORUMPOLLPOSTED = ''; $FORUMPOLLPOSTED = '';
$file = "forum_".$type."_template.php"; // $file = "forum_".$type."_template.php";
if($template = e107::getTemplate('forum', 'forum_post')) // var_dump ($type);
{ // var_dump (e107::getTemplate('forum', 'forum_'.$type));
$FORUM_POST_TEMPLATE = $template; $template = e107::getTemplate('forum', 'forum_'.$type);
} //-- if($template = e107::getTemplate('forum', 'forum_'.$type))
elseif (empty($FORUMPOST) && empty($FORUMREPLYPOSTED) && empty($FORUMTHREADPOSTED)) //-- {
//-- $FORUM_POST_TEMPLATE = $template;
//-- }
//-- elseif (empty($FORUMPOST) && empty($FORUMREPLYPOSTED) && empty($FORUMTHREADPOSTED))
if (empty($template) && empty($FORUMPOST) && empty($FORUMREPLYPOSTED) && empty($FORUMTHREADPOSTED))
{ {
$file = "forum_".$type."_template.php";
if (is_readable(THEME.$file)) if (is_readable(THEME.$file))
{ {
include_once(THEME.$file); include_once(THEME.$file);
@@ -609,33 +614,29 @@ class forum_post_handler
if($type == 'post') //-- if($type == 'post' || $type == 'posted')
if($template)
{ {
$template= (deftrue('BOOTSTRAP')) ? $FORUM_POST_TEMPLATE : array('form'=>$FORUMPOST); //-- $template= (deftrue('BOOTSTRAP')) ? $FORUM_POST_TEMPLATE : array('form'=>$FORUMPOST);
$template= (deftrue('BOOTSTRAP')) ? $template : array('form'=>$FORUMPOST);
// print_a($template); // print_a($template);
return $this->upgradeTemplate($template); return $this->upgradeTemplate($template);
} }
else //-- else
{ //-- {
if (deftrue('BOOTSTRAP')) //v2.x //-- if (deftrue('BOOTSTRAP')) //v2.x
{ //-- {
return $FORUM_POSTED_TEMPLATE; //-- return $FORUM_POSTED_TEMPLATE;
} //-- }
else //v1.x //-- else //v1.x
{ //-- {
return array( return array(
"reply" => $FORUMREPLYPOSTED, "reply" => $FORUMREPLYPOSTED,
"thread" => $FORUMTHREADPOSTED, "thread" => $FORUMTHREADPOSTED,
"poll" => $FORUMPOLLPOSTED "poll" => $FORUMPOLLPOSTED
); );
//-- }
} //-- }
}
} }