More fixes for extension loader / broken cache files

[mailer.git] / inc / modules / login.php

diff --git a/inc/modules/login.php b/inc/modules/login.php
index 5928f54c6057342a5ff8c661113012e47d1105fc..cdf0e72676539a3cdb7ef6e8299c01367b6a916b 100644 (file)
--- a/inc/modules/login.php
+++ b/inc/modules/login.php
@@ -58,14 +58,9 @@ if ($status != "CONFIRMED") {
                $ERROR = CODE_UNKNOWN_STATUS;
                break;
        }
-       $URL = URL."/modules.php?module=index&login=".$ERROR;
-       LOAD_URL($URL);
-} // END - if
 
-// Recheck if he got logged out because bad cookies
-if (!IS_MEMBER()) {
-       $URL = URL."/modules.php?module=index";
-       LOAD_URL($URL);
+       // Load URL
+       LOAD_URL(URL."/modules.php?module=index&login=".$ERROR);
 } // END - if
 
 // Load adverstising template
@@ -107,10 +102,8 @@ if ((FILE_READABLE($INC_ACTION)) && (VALIDATE_MENU_ACTION("member", GET_ACTION("
 }
 
 if (($_CONFIG['member_menu'] == "Y") || (!EXT_IS_ACTIVE("sql_patches", true))) {
-       OUTPUT_HTML("  <br /></TD>
-</TR>
-<TR>
-  <TD align=\"center\" valign=\"top\" class=\"member_advert\">");
+       // Right side of content (hint: a good place for 120x600 skyscraper banner!)
+       LOAD_TEMPLATE("member_content_right");
 
        // Some advertising stuff?
        LOAD_TEMPLATE("member_advert");