SUPEE-7405 produces errors when applied to Mag 1.9.1.1.
app/etc/applied.patches.list
displayed installed patches are:
SUPEE-5998 | EE_1.14.1.0 | v1
SUPEE-6237 | EE_1.14.2.0 | v1
SUPEE-6285 | CE_1.9.1.1 | v1
SUPEE-6285 | CE_1.9.1.1 | v1 (REVERTED)
SUPEE-6285 | CE_1.9.1.1 | v2
SUPEE-6482 | CE_1.9.2.0 | v1
SUPEE-6788 | CE_1.9.1.1 | v1
SUPEE-7616 | CE_1.9.2.2-CE_1.8.0.0 | v1
After installing SUPEE-7405 the following errors are displayed:
Checking if patch can be applied/reverted successfully...
ERROR: Patch can't be applied/reverted successfully.
patching file app/code/core/Mage/Admin/Model/Observer.php
patching file app/code/core/Mage/Admin/Model/Redirectpolicy.php
...
patching file app/code/core/Mage/Core/Model/Email/Queue.php
patching file app/code/core/Mage/Core/Model/Email/Template/Filter.php
Hunk #1 FAILED at 171.
Hunk #2 succeeded at 194 (offset 2 lines).
1 out of 2 hunks FAILED -- saving rejects to file app/code/core/Mage/Core/Model/Email/Template/Filter.php.rej
patching file app/code/core/Mage/Core/Model/File/Validator/Image.php
...
patching file lib/Varien/Io/File.php
At around line 171, I had added $block = false;
under Retrieve Block html directive section of Filter.php
, since I was getting ERR (3): Notice: Undefined variable: block
in the system.log file. The error went away. The suggestion came from this post.
So I removed the above fix. ($block = false;
), and tried to apply SUPEE-7405 again. It now produced the following error:
Checking if patch can be applied/reverted successfully...
ERROR: Patch can't be applied/reverted successfully.
patching file app/code/core/Mage/Admin/Model/Observer.php
...
patching file app/code/core/Mage/Core/Model/Email/Template/Filter.php
Hunk #1 FAILED at 171.
1 out of 2 hunks FAILED -- saving rejects to file app/code/core/Mage/Core/Model/Email/Template/Filter.php.rej
patching file app/code/core/Mage/Core/Model/File/Validator/Image.php
...
patching file lib/Varien/Io/File.php
So at this time I went a head using winMerge compared the original Filter.php
from magento-1.9.1.1-2015-04-30-12-49-08.zip
to my Filter.php
file. I found the following differences.
p.s. I have not added any of the following!.
At this point I do not know how to apply the new SUPEE-7405 to the site?