Code changes - 3.05 to 3.06

Get help with installation and running phpBB 3.0.x here. Please do not post bug reports, feature requests, or MOD-related questions here.
Scam Warning
Forum rules
END OF SUPPORT: 1 January 2017 (announcement)
Locked
charley
Registered User
Posts: 132
Joined: Sun Oct 12, 2003 11:08 pm
Location: Motherwell, Scotland

Code changes - 3.05 to 3.06

Post by charley » Thu Nov 19, 2009 1:01 pm

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?

User avatar
Erik Frèrejean
Former Team Member
Posts: 9899
Joined: Tue Oct 09, 2007 9:09 am
Location: The Netherlands, 3.0.x Support Forum
Name: Erik Frèrejean
Contact:

Re: Code changes - 3.05 to 3.06

Post by Erik Frèrejean » Thu Nov 19, 2009 4:40 pm

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/).
Support Toolkit | Support Request Template | Knowledge Base | phpBB 3.0.x documentation
I don't give support via PM or IM! (all unsolicited pms will be trashed!)

djdrageris
Registered User
Posts: 63
Joined: Tue Apr 28, 2009 7:52 pm

Re: Code changes - 3.05 to 3.06

Post by djdrageris » Thu Nov 19, 2009 4:58 pm

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?

User avatar
Erik Frèrejean
Former Team Member
Posts: 9899
Joined: Tue Oct 09, 2007 9:09 am
Location: The Netherlands, 3.0.x Support Forum
Name: Erik Frèrejean
Contact:

Re: Code changes - 3.05 to 3.06

Post by Erik Frèrejean » Thu Nov 19, 2009 4:59 pm

Yes the red is removed, the green is added. If both occur on the same line its obviously a replacement ;).
Support Toolkit | Support Request Template | Knowledge Base | phpBB 3.0.x documentation
I don't give support via PM or IM! (all unsolicited pms will be trashed!)

djdrageris
Registered User
Posts: 63
Joined: Tue Apr 28, 2009 7:52 pm

Re: Code changes - 3.05 to 3.06

Post by djdrageris » Thu Nov 19, 2009 5:34 pm

thank you

charley
Registered User
Posts: 132
Joined: Sun Oct 12, 2003 11:08 pm
Location: Motherwell, Scotland

Re: Code changes - 3.05 to 3.06

Post by charley » Thu Nov 19, 2009 6:39 pm

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 140 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.

djdrageris
Registered User
Posts: 63
Joined: Tue Apr 28, 2009 7:52 pm

Re: Code changes - 3.05 to 3.06

Post by djdrageris » Thu Nov 19, 2009 7:08 pm

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..

Locked

Return to “[3.0.x] Support Forum”