Page 1 of 1

Code changes - 3.05 to 3.06

Posted: Thu Nov 19, 2009 1:01 pm
by charley
I need some code changes in mod format for a few of the php files from 3.05 to 3.06. Where do we find the mod file for this?

Re: Code changes - 3.05 to 3.06

Posted: Thu Nov 19, 2009 4:40 pm
by Erik Frèrejean
charley wrote:I need some code changes in mod format for a few of the php files from 3.05 to 3.06. Where do we find the mod file for this?
Why don't you use the automatic updater? There are no code changes provided for this update as its simply to big for that. If really required you could use the diffs (http://www.phpbb.com/support/code-changes/).

Re: Code changes - 3.05 to 3.06

Posted: Thu Nov 19, 2009 4:58 pm
by djdrageris
expmple i looking this file http://code.phpbb.com/repositories/diff ... s&type=sbs


so Red code is deleted or repleiced.... ?

green code is new inserted?

Re: Code changes - 3.05 to 3.06

Posted: Thu Nov 19, 2009 4:59 pm
by Erik Frèrejean
Yes the red is removed, the green is added. If both occur on the same line its obviously a replacement ;).

Re: Code changes - 3.05 to 3.06

Posted: Thu Nov 19, 2009 5:34 pm
by djdrageris
thank you

Re: Code changes - 3.05 to 3.06

Posted: Thu Nov 19, 2009 6:39 pm
by charley
I've tried merging the differences with the "remove modified code" option.

Every file has worked except my functions.php file. I have merged the differences and downloaded the new file. However, every time I replace the conflict file with the new file, I run the file check and again it shows as a conflicting file.

Here's a screenshot attached:
Screenshot.png
Screenshot.png (25.68 KiB) Viewed 137 times
It doesn't matter how many times I merge the differences, it still shows as a conflicting file. This is the last file I need to remedy.

Any help appreciated.

Re: Code changes - 3.05 to 3.06

Posted: Thu Nov 19, 2009 7:08 pm
by djdrageris
i think u need do:
see this link

http://code.phpbb.com/repositories/diff ... s&type=sbs

open includes.php from your ftp with notapedd++ or other too

after: remove where is red lines and add green lines...

after file edition... just save and replace...

and where conflict file just select "do not merge - use curelntly instled file"


and i hope... wil be working fine updates... this is my teory but tomorow i will try this..