Hi,
Im trying to apply the 11086 patch to my Magento 1.7.0.0 store.
As far as Im aware I have all the other patches installed.
When I try to apply the patch I get:
patching file app/code/core/Mage/Admin/Model/Session.php
Hunk #1 FAILED at 157.
Hunk #2 succeeded at 228 (offset -48 lines).
1 out of 2 hunks FAILED -- saving rejects to file app/code/core/Mage/Admin/Model/Session.php.rej
I have tried replacing that file with a freshly downloaded version for Magento 1.7.0.0 but I get the same error.
I have also tried applying 2 different versions of the patch:
PATCH_SUPEE-11086_CE_1.6.2.0_v1-2019-03-26-03-02-01
PATCH_SUPEE-11086_CE_1.7.0.2_v1-2019-03-26-03-02-36
These are the patches Ive applied already from applied patch list:
SUPEE-1533
SUPEE-5345
SUPEE-5994
SUPEE-6482
SUPEE-6285
SUPEE-6788
SUPEE-6788
SUPEE-6237
SUPEE-6788
SUPEE-5994
SUPEE-7405-CE-1-7-0-2
SUPEE-7405
SUPEE-3941
SUPEE-8788
SUPEE-9652
SUPEE-8167
PATCH_SUPEE-9767_CE_1.7.0.2_v2
SUPEE-10266-CE-1.7.0.2
SUPEE-10415-ce-1.7.0.0
SUPEE-10570_CE_v1.7.0.0
SUPEE-10752_CE_v1.7.0.2
SUPEE-10888_CE_v1.7.0.2
SUPEE-10975_CE_v1.7.0.0
Is there any way to get this to work? Do I need to revert any previous patches?
Can I do this manually?
in the patch it looks like I need to remove these lines:
- Mage::dispatchEvent('admin_session_user_login_failed',
- array('user_name' => $username, 'exception' => $e));
- if ($request && !$request->getParam('messageSent')) {
- Mage::getSingleton('adminhtml/session')->addError($e->getMessage());
- $request->setParam('messageSent', true);
and replace with these lines:
+ $this->_loginFailed($e, $request, $username, $e->getMessage());
+ } catch (Exception $e) {
+ $message = Mage::helper('adminhtml')->__('An error occurred while logging in.');
+ $this->_loginFailed($e, $request, $username, $message);
}
- }
Can I do that and then delete those lines from the patch and reapply it?
Also there are 3 lines above those but they dont have any + or - at the start, should these lines be deleted too? They dont seem to be in my session.php?
$e->setMessage(
Mage::helper('adminhtml')->__('You did not sign in correctly or your account is temporarily disabled.')
);
