pronto.ee

While applying SUPEE-11155 to Magento 1.x there’s a good chance that you will run into something like this one:

checking file js/tiny_mce/plugins/media/js/media.js
Hunk #1 FAILED at 483 (different line endings).
1 out of 1 hunk FAILED

Inspecting both the file mentioned and the relevant diff inside the patch leaves impression that everything is OK, however the problem still persists. Wtf?

This problem is almost certainly caused by Git replacing Windows line endings (\r\n) with the ones used by pretty much the rest of the world (\n). Tiny MCE media.js file for some reason uses Windows line endings (unlike other parts of Magento) and the patch expect it to be like this. However quite often Git systems are configured to convert line endings and thus the patching will fail with the message above.

Easiest way to to fix it is to use vim. Open patch file with vim and find the diff used to update media.js. To do it type (slash means search):

/media.js  

Once there enter:

:set list

This command enables displaying of whitespace characters. You will notice that media.js rows in patch file end with ^M (Carriage Return). Remove those, save and run the patch again. Everything should work just fine now.