select
diff --git a/app/code/core/Mage/Checkout/sql/maho_setup/maho-24.10.0.php b/app/code/core/Mage/Checkout/sql/maho_setup/maho-24.10.0.php
new file mode 100644
index 000000000..374624bb4
--- /dev/null
+++ b/app/code/core/Mage/Checkout/sql/maho_setup/maho-24.10.0.php
@@ -0,0 +1,30 @@
+getWebsites(true) as $website) {
+ $configValue = !$website->getConfig(XML_PATH_GUEST_CHECKOUT) && $website->getConfig(XML_PATH_CUSTOMER_MUST_BE_LOGGED);
+ if ($website->getId() === 0) {
+ $defaultConfigValue = $configValue;
+ $this->setConfigData(XML_PATH_REDIRECT_REGISTER, $configValue);
+ } elseif ($configValue !== $defaultConfigValue) {
+ $this->setConfigData(XML_PATH_REDIRECT_REGISTER, true, 'websites', $website->getId());
+ }
+}
+
+$installer->endSetup();
diff --git a/app/design/frontend/base/default/template/checkout/onepage/login.phtml b/app/design/frontend/base/default/template/checkout/onepage/login.phtml
index 3116d5d59..c4cded8dc 100644
--- a/app/design/frontend/base/default/template/checkout/onepage/login.phtml
+++ b/app/design/frontend/base/default/template/checkout/onepage/login.phtml
@@ -19,8 +19,8 @@
?>
helper('customer')->isRegistrationAllowed();
+$isRedirectRegisterStep = $this->helper('checkout')->isRedirectRegisterStep();
$isAllowedGuestCheckout = $this->helper('checkout')->isAllowedGuestCheckout($this->getQuote());
-$isCustomerMustBeLogged = $this->helper('checkout')->isCustomerMustBeLogged();
$isPersistentEnabled = $this->helper('checkout')->isPersistentEnabled();
?>
@@ -59,17 +59,9 @@ $isPersistentEnabled = $this->helper('checkout')->isPersistentEnabled();
@@ -105,13 +97,14 @@ $isPersistentEnabled = $this->helper('checkout')->isPersistentEnabled();
-
+
getRequest()->getParam('register') ?>