Commit 5dcf538f authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review
Browse files

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

parents b1afecc3 51910ec5
......@@ -781,6 +781,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