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

htdocs/lib/web.php

@@ -781,6 +781,7 @@ EOF;
                 ),
             );
         }
+        $smarty->assign('SHOWLOGINBLOCK', $isloginblockvisible);
 
         if (get_config('enablenetworking')) {
             require_once(get_config('docroot') .'api/xmlrpc/lib.php');

htdocs/theme/raw/templates/header/topright.tpl

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