From c87220bcc03dbbbc38fa928c539a29ef80a000b2 Mon Sep 17 00:00:00 2001
From: Jimako <janamicek@gmail.com>
Date: Fri, 11 Jan 2019 11:03:56 +0100
Subject: [PATCH 1/3] partfix #3607 forum dropdowns

---
 e107_plugins/forum/shortcodes/batch/viewforum_shortcodes.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/e107_plugins/forum/shortcodes/batch/viewforum_shortcodes.php b/e107_plugins/forum/shortcodes/batch/viewforum_shortcodes.php
index e869e3b22..2da5a6338 100644
--- a/e107_plugins/forum/shortcodes/batch/viewforum_shortcodes.php
+++ b/e107_plugins/forum/shortcodes/batch/viewforum_shortcodes.php
@@ -111,7 +111,7 @@
 			//--	foreach($jumpList as $key => $val)
 			foreach($jumpList as $val)
 			{
-				$text .= '<li><a href="' . e107::url('forum', 'forum', $val) . '">' . LAN_FORUM_1017 . ': ' . $val['forum_name'] . '</a></li>';
+				$text .= '<li><a class="dropdown-item" href="' . e107::url('forum', 'forum', $val) . '">' . LAN_FORUM_1017 . ': ' . $val['forum_name'] . '</a></li>';
 			}
 
 			$text .= '

From 87d02d86e730d39878a27e5b48d1d0ea9c86784b Mon Sep 17 00:00:00 2001
From: Jimako <janamicek@gmail.com>
Date: Fri, 11 Jan 2019 11:12:10 +0100
Subject: [PATCH 2/3] partfix #3607 forum dropdown fix

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

diff --git a/e107_plugins/forum/forum_viewforum.php b/e107_plugins/forum/forum_viewforum.php
index 5e5dc75ca..620948413 100644
--- a/e107_plugins/forum/forum_viewforum.php
+++ b/e107_plugins/forum/forum_viewforum.php
@@ -1011,11 +1011,11 @@ function fadminoptions($thread_info)
 	
 
 
-	$text .= "<li class='text-right'><a href='".e_REQUEST_URI."' data-forum-action='delete' data-forum-thread='".$id."'>".LAN_DELETE." ".$tp->toGlyph('trash')."</a></li>";
-	$text .= "<li class='text-right'><a href='".e_REQUEST_URI."' data-forum-action='".$stickUnstick."' data-forum-thread='".$id."'>".$lan[$stickUnstick]." ".$icon[$stickUnstick]."</a></li>";
-	$text .= "<li class='text-right'><a href='".e_REQUEST_URI."' data-forum-action='".$lockUnlock."' data-forum-thread='".$id."'>".$lan[$lockUnlock]." ".$icon[$lockUnlock]."</a></li>";
+	$text .= "<li class='text-right'><a class='dropdown-item' href='".e_REQUEST_URI."' data-forum-action='delete' data-forum-thread='".$id."'>".LAN_DELETE." ".$tp->toGlyph('trash')."</a></li>";
+	$text .= "<li class='text-right'><a class='dropdown-item' href='".e_REQUEST_URI."' data-forum-action='".$stickUnstick."' data-forum-thread='".$id."'>".$lan[$stickUnstick]." ".$icon[$stickUnstick]."</a></li>";
+	$text .= "<li class='text-right'><a class='dropdown-item' href='".e_REQUEST_URI."' data-forum-action='".$lockUnlock."' data-forum-thread='".$id."'>".$lan[$lockUnlock]." ".$icon[$lockUnlock]."</a></li>";
 	
-	$text .= "<li class='text-right'><a href='{$moveUrl}'>".LAN_FORUM_2042." ".$tp->toGlyph('move')."</a></li>";
+	$text .= "<li class='text-right'><a class='dropdown-item' href='{$moveUrl}'>".LAN_FORUM_2042." ".$tp->toGlyph('move')."</a></li>";
 
 	if(e_DEVELOPER)
 	{

From 254f56a449841016fabb0e60a35e2db295c04e6d Mon Sep 17 00:00:00 2001
From: Tijn Kuyper <Moc@users.noreply.github.com>
Date: Sat, 12 Jan 2019 18:12:26 +0100
Subject: [PATCH 3/3] Render help text in Admin Area in correct language

Admin Area language setting ($pref['adminlanguage']) rather than Frontend language setting (e_LANGUAGE or $pref['sitelanguage'])
---
 e107_core/shortcodes/batch/admin_shortcodes.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/e107_core/shortcodes/batch/admin_shortcodes.php b/e107_core/shortcodes/batch/admin_shortcodes.php
index 150647657..8efea4d95 100644
--- a/e107_core/shortcodes/batch/admin_shortcodes.php
+++ b/e107_core/shortcodes/batch/admin_shortcodes.php
@@ -172,9 +172,9 @@ class admin_shortcodes
 		
 		if(strpos(e_SELF, e_ADMIN_ABS) !== false)
 		{
-			if (is_readable(e_LANGUAGEDIR.e_LANGUAGE.'/admin/help/'.e_PAGE))
+			if (is_readable(e_LANGUAGEDIR.'/'.$pref['adminlanguage'].'/admin/help/'.e_PAGE))
 			{
-				$helpfile = e_LANGUAGEDIR.e_LANGUAGE.'/admin/help/'.e_PAGE;
+				$helpfile = e_LANGUAGEDIR.'/'.$pref['adminlanguage'].'/admin/help/'.e_PAGE;
 			}
 			elseif (is_readable(e_LANGUAGEDIR.'English/admin/help/'.e_PAGE))
 			{