mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-09 16:17:14 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/e107inc/e107

Browse Source
This commit is contained in:
Tijn Kuyper
2019-01-13 13:11:05 +01:00
parent 7cfcaee1d0 254f56a449
commit df8ff0f5c0
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
e107_core/shortcodes/batch/admin_shortcodes.php
View File

@@ -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))
{

8
e107_plugins/forum/forum_viewforum.php
View File

@@ -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)
{

2
e107_plugins/forum/shortcodes/batch/viewforum_shortcodes.php
View File

@@ -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 .= '