Commit f4a92e07 authored by Robert Lyon's avatar Robert Lyon

Bug 1537912: Allow the 'login' link to show when sidebars exist

There was a setting to stop the login link (top right) from showing if
there were sidebars on logged out homepage. This became a problem if
the login box was turned off (not counted as a sidebar block for some
reason) via $cfg->showloginsideblock = false;

But the top right login link should always show when logged out
whether a sidebar is in play or not.

behatnotneeded

Change-Id: I8d6c1916f165285afb1f0210a0ae9b364f3a7a4f
Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
(cherry picked from commit 51910ec5)
parent ca4c3130
......@@ -785,6 +785,7 @@ EOF;
),
);
}
$smarty->assign('SHOWLOGINBLOCK', $isloginblockvisible);
if (get_config('enablenetworking')) {
require_once(get_config('docroot') .'api/xmlrpc/lib.php');
......
......@@ -43,7 +43,7 @@
</li>
{/if}
{/strip}
{if !$LOGGEDIN && !$SIDEBARS && !$LOGINPAGE}
{if !$LOGGEDIN && !$SHOWLOGINBLOCK && !$LOGINPAGE}
<li id="loginlink" class="has-icon login-link">
<a href="{$WWWROOT}?login" accesskey="l">
<span class="icon icon-sign-in" role="presentation" aria-hidden="true"></span>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment