From d9d606f6153005d28e0d0d70d53731b593463c1e Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Thu, 2 Dec 2021 10:22:52 -0800
Subject: [PATCH] Fixes #4583 - filetype values missing from forum attachment
 tooltip message.

---
 e107_plugins/forum/forum_class.php                      | 2 +-
 e107_plugins/forum/shortcodes/batch/post_shortcodes.php | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/e107_plugins/forum/forum_class.php b/e107_plugins/forum/forum_class.php
index 7cb8a85d1..f28ea3888 100644
--- a/e107_plugins/forum/forum_class.php
+++ b/e107_plugins/forum/forum_class.php
@@ -2380,7 +2380,7 @@ class e107forum
 
 			$FORUM_CRUMB['fieldlist'] = 'sitename,forums,parent,subparent,forum,thread';
 
-			$BREADCRUMB = $tp->parseTemplate('{BREADCRUMB=FORUM_CRUMB}', true);
+			$BREADCRUMB = $tp->parseTemplate('{BREADCRUMB=FORUM_CRUMB}', false); // must stay as 'false' to prevent sending to theme shortcodes.
 		}
 		else
 		{
diff --git a/e107_plugins/forum/shortcodes/batch/post_shortcodes.php b/e107_plugins/forum/shortcodes/batch/post_shortcodes.php
index 0ae868d16..bd2a2aaf1 100644
--- a/e107_plugins/forum/shortcodes/batch/post_shortcodes.php
+++ b/e107_plugins/forum/shortcodes/batch/post_shortcodes.php
@@ -297,9 +297,9 @@ class plugin_forum_post_shortcodes extends e_shortcode
 		global $forum;
 		
 		//. <div>".($pref['image_post'] ? "Attach file / image" : "Attach file")."</div>
-		
-		//$tooltip = "Allowed file types | ".vartrue($allowed_filetypes).". Any other file type will be deleted instantly. Maximum file size: ".(vartrue($max_upload_size) ? $max_upload_size."bytes" : ini_get('upload_max_filesize'));
-		$tooltip = LAN_FORUM_3016.": ".vartrue($allowed_filetypes)." <br />".LAN_FORUM_3017."<br />".LAN_FORUM_3018.": ".(vartrue($max_upload_size) ? $max_upload_size." ".LAN_FORUM_3019 : ini_get('upload_max_filesize')); // FIXME <br /> in tooltip, no value $allowed_filetypes on v2/bootstrap
+		$allowedFileTypes = e107::getFile()->getAllowedFileTypes();
+
+		$tooltip = LAN_FORUM_3016.": ".implode(', ',array_keys($allowedFileTypes))."\n".LAN_FORUM_3017."\n".LAN_FORUM_3018.": ".(vartrue($max_upload_size) ? $max_upload_size." ".LAN_FORUM_3019 : ini_get('upload_max_filesize'));
 
 		$fileattach = "
 			<div>