We reverted 9767 V1 which installed fine but disabled the formkey on the checkout. When we tried to install V2 we got this error:
patching file app/code/core/Mage/Customer/controllers/AccountController.php
Hunk #1 FAILED at 333.
Hunk #2 FAILED at 585.
2 out of 2 hunks FAILED -- saving rejects to file app/code/core/Mage/Customer/controllers/AccountController.php.rej
When I look at the problem line in the patch I see this:
diff --git app/code/core/Mage/Customer/controllers/AccountController.php app/code/core/Mage/Customer/controllers/AccountController.php
index a910913..c65c577 100644
--- app/code/core/Mage/Customer/controllers/AccountController.php
+++ app/code/core/Mage/Customer/controllers/AccountController.php
@@ -333,7 +333,6 @@ class Mage_Customer_AccountController extends Mage_Core_Controller_Front_Action
$url = $this->_getUrl('*/*/index', array('_secure' => true));
} else {
$session->setCustomerAsLoggedIn($customer);
- $session->renewSession();
$url = $this->_welcomeCustomer($customer);
}
$this->_redirectSuccess($url);
@@ -586,7 +585,6 @@ class Mage_Customer_AccountController extends Mage_Core_Controller_Front_Action
throw new Exception($this->__('Failed to confirm customer account.'));
}
- $session->renewSession();
// log in and send greeting email, then die happy
$session->setCustomerAsLoggedIn($customer);
$successUrl = $this->_welcomeCustomer($customer, true);The problem with this is the AccountController.php doesn't have lines that match up exactly like that.
Line 333 to 355 in Magento 1.6.0.0 look like this:
if (true === $validationResult) {
$customer->save();
Mage::dispatchEvent('customer_register_success',
array('account_controller' => $this, 'customer' => $customer)
);
if ($customer->isConfirmationRequired()) {
$customer->sendNewAccountEmail(
'confirmation',
$session->getBeforeAuthUrl(),
Mage::app()->getStore()->getId()
);
$session->addSuccess($this->__('Account confirmation is required. Please, check your email for the confirmation link. To resend the confirmation email please <a href="%s">click here</a>.', Mage::helper('customer')->getEmailConfirmationUrl($customer->getEmail())));
$this->_redirectSuccess(Mage::getUrl('*/*/index', array('_secure'=>true)));
return;
} else {
$session->setCustomerAsLoggedIn($customer);
$url = $this->_welcomeCustomer($customer);
$this->_redirectSuccess($url);
return;
}I've looked back a few patchs and the last patch to touch the AccountController.php was 6788 and it didn't make a change to the file that would allow this patch to work so I'm not sure what went wrong here. Any help would be appreciated.
