From 676aceb28b6870d51d3ad313f3badab2725a89d8 Mon Sep 17 00:00:00 2001
From: Moc <tijnkuyper@gmail.com>
Date: Thu, 16 Jul 2015 18:24:44 +0200
Subject: [PATCH] #1143 - Some forum fixes for v1 themes

---
 e107_plugins/forum/shortcodes/batch/post_shortcodes.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/e107_plugins/forum/shortcodes/batch/post_shortcodes.php b/e107_plugins/forum/shortcodes/batch/post_shortcodes.php
index 76067c263..26a96c16d 100644
--- a/e107_plugins/forum/shortcodes/batch/post_shortcodes.php
+++ b/e107_plugins/forum/shortcodes/batch/post_shortcodes.php
@@ -61,7 +61,7 @@ class plugin_forum_post_shortcodes extends e_shortcode
 
 	function sc_forumjump()
 	{
-		return forumjump();
+		return forumjump(); // FIXME - broken in v1 themes
 	}
 
 	function sc_userbox()
@@ -95,8 +95,8 @@ class plugin_forum_post_shortcodes extends e_shortcode
 
 	function sc_subjectbox()
 	{
-		global $subjectbox, $action;
-		return ($action == 'nt' ? $subjectbox : '');
+		global $subjectbox;
+		return ($this->var['action'] == 'nt' ? $subjectbox : '');
 	}
 
 	function sc_forum_subject()
@@ -207,7 +207,7 @@ class plugin_forum_post_shortcodes extends e_shortcode
 
 		$uploadClass = e107::pref('core','upload_class');
 
-		if ($forum->prefs->get('attach') && (check_class($uploadClass) || getperms('0')))
+		if ($this->forum->prefs->get('attach') && (check_class($uploadClass) || getperms('0')))
 		{
 			if (is_writable(e_PLUGIN.'forum/attachments'))
 			{