You don't need to necessarily understand PHP to know how to do the merge.. My suggestion is this:
Treat the version 5.3 files as the master, then in Winmerge, look for the code that is NOT in the 5.3 version of the file that IS in the IH version. That code is what you want to merge into the 5.3 version of the file..
Now after that you will want to test your new file in PHP 5.3, if you get errors, then you will have a place to start.. You'd be amazed how quickly people respond to specific errors versus "possible" errors..
Sometimes it may be the fastest solution to approach it this way versus waiting for someone to post the corrected file..
FYI.. I don't know PHP either, but I understand "find and replace".. The changes required for PHP 5.3 compatibility seem fairly straightforward enough that you should be able to tackle it yourself.. Seriously..
Going back to this file, you would be looking at the IH2 specific code that you are merging and making sure that any of the changes required for PHP 5.3 compatibility are addressed..
Honestly, I wouldn't suggest this if I didn't think it was doable.. There's a link I posted onthew Zen 2.0 thread which takes you to the Google board which outlines the changes required for PHP 5.3 compatibility..
Bookmarks