1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-20 21:32:09 +02:00

Merge pull request #2291 from yesszus/patch-1

Update comment_shortcodes.php
This commit is contained in:
Cameron
2017-01-17 10:14:50 -08:00
committed by GitHub
7 changed files with 29 additions and 21 deletions

View File

@@ -1228,7 +1228,7 @@ class forum_post_handler
if($postResult === -1 || $newPostId === -1) //Duplicate post
{
require_once(HEADERF);
$message = LAN_FORUM_3006."<br ><a class='btn btn-default' href='".$_SERVER['HTTP_REFERER']."'>Return</a>";
$message = LAN_FORUM_3006."<br ><a class='btn btn-default' href='".$_SERVER['HTTP_REFERER']."'>".LAN_FORUM_8028."</a>";
$text = e107::getMessage()->addError($message)->render();
e107::getRender()->tablerender(LAN_PLUGIN_FORUM_NAME, $text); // change to forum-title pref.
require_once(FOOTERF);
@@ -1282,7 +1282,7 @@ class forum_post_handler
$txt = e107::getParser()->parseTemplate($txt,true, $SHORTCODES);
e107::getRender()->tablerender('Forums', e107::getMessage()->render().$txt);
e107::getRender()->tablerender(e_PAGETITLE, e107::getMessage()->render().$txt);
require_once(FOOTERF);
exit;
}

View File

@@ -343,6 +343,8 @@ define("LAN_FORUM_8024", "Failed to open thread");
define("LAN_FORUM_8025", "Failed to stick thread");
define("LAN_FORUM_8026", "Failed to unstick thread");
define("LAN_FORUM_8027", "No action selected");
define("LAN_FORUM_8028", "Return");
define("LAN_FORUM_8029", "New topic created!");
/* THIS WILL BE DELETED ONCE THE REWRITE IS DONE
==================================================

View File

@@ -66,13 +66,13 @@ $FORUMREPLYPOSTED = "
$FORUM_POSTED_TEMPLATE['poll'] = $FORUMPOLLPOSTED;
$FORUM_POSTED_TEMPLATE['thread'] = "<div class='alert alert-success'>
<h4>New topic created.</h4>
<h4>".LAN_FORUM_8029."</h4>
<a class='btn btn-primary' href='{THREADLINK}'>".LAN_FORUM_3048."</a>
<a class='btn btn-primary' href='{FORUMLINK}'>".LAN_FORUM_2022."</a>
</div>";
$FORUM_POSTED_TEMPLATE['reply'] = "<div class='alert alert-success'>
<h4>New reply created.</h4>
<h4>".LAN_FORUM_3049."</h4>
<a class='btn btn-primary' href='{THREADLINK}'>".LAN_FORUM_3048."</a>
<a class='btn btn-primary' href='{FORUMLINK}'>".LAN_FORUM_2022."</a>
</div>";
@@ -82,4 +82,4 @@ $FORUM_POSTED_TEMPLATE['reply'] = "<div class='alert alert-success'>
?>
?>