diff --git a/e107_plugins/forum/shortcodes/batch/post_shortcodes.php b/e107_plugins/forum/shortcodes/batch/post_shortcodes.php
index b55bd07da8..eac2ea316f 100644
--- a/e107_plugins/forum/shortcodes/batch/post_shortcodes.php
+++ b/e107_plugins/forum/shortcodes/batch/post_shortcodes.php
@@ -480,14 +480,13 @@ function sc_noemotes()
function sc_forum_post_email_notify()
{
-
-
global $threadInfo, $action, $eaction;
$pref = e107::getPlugPref('forum');
if($eaction == true) { return ; }
- if (vartrue($pref['notify']) && $action == 'nt' && USER)
+
+ if (vartrue($pref['notify']) && $this->var['action'] == 'nt' && USER)
{
if(isset($_POST['fpreview']))
{
@@ -507,6 +506,7 @@ function sc_forum_post_email_notify()
}
return "
".LAN_FORUM_3040."";
}
+
return '';
}