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

Merge pull request #3387 from SimSync/fix_3377

Browse Source 
fixes #3377 Enabled "preview" button on forum post edit
This commit is contained in:
Cameron
2018-08-22 18:16:02 -07:00
committed by GitHub
parent 7058aa322d ddf7eced79
commit c317515847
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
e107_plugins/forum/forum_post.php
View File

@@ -155,6 +155,7 @@ class forum_post_handler
$forumInfo = $this->forumObj->forumGet($postInfo['post_forum']); $forumInfo = $this->forumObj->forumGet($postInfo['post_forum']);
$data = array_merge($postInfo ,$forumInfo); $data = array_merge($postInfo ,$forumInfo);
$data['action'] = $this->action; $data['action'] = $this->action;
$data['initial_post'] = $this->forumObj->threadDetermineInitialPost($this->post);
$this->setPageTitle($data); $this->setPageTitle($data);
return $data; return $data;
break; break;
@@ -1026,6 +1027,11 @@ class forum_post_handler
$tsubject = $tp->post_toHTML($_POST['subject'], true); $tsubject = $tp->post_toHTML($_POST['subject'], true);
$tpost = $tp->post_toHTML($_POST['post'], true); $tpost = $tp->post_toHTML($_POST['post'], true);
if (empty($tsubject))
{
$tsubject = $this->data['thread_name'];
}
if ($_POST['poll_title'] != '' && check_class($this->forumObj->prefs->get('poll'))) if ($_POST['poll_title'] != '' && check_class($this->forumObj->prefs->get('poll')))
{ {
require_once(e_PLUGIN."poll/poll_class.php"); require_once(e_PLUGIN."poll/poll_class.php");

6
e107_plugins/forum/shortcodes/batch/post_shortcodes.php
View File

@@ -122,7 +122,7 @@ class plugin_forum_post_shortcodes extends e_shortcode
elseif($this->var['action'] == 'edit') elseif($this->var['action'] == 'edit')
{ {
$_POST['subject'] = $this->var['thread_name']; $_POST['subject'] = $this->var['thread_name'];
if($this->var['thread_user'] != USERID && !deftrue('MODERATOR')) if($this->var['thread_user'] != USERID && !deftrue('MODERATOR') || !$this->var['initial_post'])
{ {
$opts['disabled'] = 1; $opts['disabled'] = 1;
} }
@@ -196,11 +196,11 @@ class plugin_forum_post_shortcodes extends e_shortcode
// This user created the thread and is editing the original post. // This user created the thread and is editing the original post.
if($this->var['thread_datestamp'] == $this->var['post_datestamp'] && $this->var['thread_user'] == $this->var['post_user']) if($this->var['thread_datestamp'] == $this->var['post_datestamp'] && $this->var['thread_user'] == $this->var['post_user'])
{ {
return "<input class='btn btn-primary button' type='submit' name='update_thread' value='".LAN_FORUM_3023."' />"; return $ret . "<input class='btn btn-primary button' type='submit' name='update_thread' value='".LAN_FORUM_3023."' />";
} }
else // editing a reply. else // editing a reply.
{ {
return "<input class='btn btn-primary button' type='submit' name='update_reply' value='".LAN_FORUM_3024."' />"; return $ret . "<input class='btn btn-primary button' type='submit' name='update_reply' value='".LAN_FORUM_3024."' />";
} }
} }

5
e107_plugins/forum/templates/forum_preview_template.php
View File

@@ -27,8 +27,9 @@ $FORUM_PREVIEW = "<div>
//v2.x Bootstrap //v2.x Bootstrap
$FORUM_PREVIEW_TEMPLATE['item'] = "<div class='alert alert-warning alert-block'> $FORUM_PREVIEW_TEMPLATE['item'] = "<div class='alert alert-warning alert-block'>
<div><b>{PREVIEW_SUBJECT}</b></div> <div><h4>{PREVIEW_SUBJECT}</h4></div>
{PREVIEW_POST} <br>
{PREVIEW_POST}
</div>"; </div>";
?> ?>