Nils Adermann 47ce0f2a93 Update: Store expected resulting file contents in cache and do not suggest further merges if the contents match, also fixes infinite merge loop [Bug #54075] ...

If you were trying to update from 3.0.5 to 3.0.6 but were presented with a dialogue
suggesting to merge the same file over and over take the install/install_update.php
from 3.0.7-RC2 or current svn, and replace your 3.0.5 one with it. It works fine in
3.0.5.


git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10528 89ea8834-ac86-4346-8a33-228a782c2dd0

2010-02-23 23:35:48 +00:00

..

adm

merge r10513 into 3.0 branch: propdel

2010-02-23 16:18:57 +00:00

cache

…

develop

fix_files script must have been broken by svn:eol-style quite a while ago, now uses tr rather than sed to replace carriage returns

2010-01-31 21:50:10 +00:00

docs

Update: Store expected resulting file contents in cache and do not suggest further merges if the contents match, also fixes infinite merge loop [Bug #54075]

2010-02-23 23:35:48 +00:00

download

#54245

2009-11-21 09:14:07 +00:00

files

…

images

…

includes

Fix Bug #57375 - Do not delete unrelated attachments when deleting empty forums.

2010-02-23 18:52:06 +00:00

install

Update: Store expected resulting file contents in cache and do not suggest further merges if the contents match, also fixes infinite merge loop [Bug #54075]

2010-02-23 23:35:48 +00:00

language

Enter stage left: the INTTEXT token

2010-02-21 11:33:29 +00:00

store

39745 - permissions should handle it, but why not

2009-01-07 12:53:22 +00:00

styles

Fix Bug #57505 - Replace button2 with btnlite, button2 doesn't exist.

2010-02-09 14:10:42 +00:00

.htaccess

[Feature] Ability to use HTTP authentication in ATOM feeds by passing the GET parameter auth=http

2010-01-19 19:08:51 +00:00

common.php

PHP 5.3 compatibility: Disable E_DEPRECATED on startup to keep set_magic_quotes_runtime(0) quiet. [Bug #54495]

2009-12-06 02:30:24 +00:00

config.php

fail <3 r9769

2009-07-17 13:23:09 +00:00

cron.php

…

faq.php

populate who is online only where required

2009-08-12 10:30:37 +00:00

feed.php

Let's remove this warning again, since it for example also works quite well with the topic_id.

2010-01-24 16:06:23 +00:00

index.php

fix r9604

2009-06-18 11:04:54 +00:00

mcp.php

fix mcp sorting for pm_reports, and some minor language changes

2009-07-22 13:33:54 +00:00

memberlist.php

Small text corrections. r10393

2009-12-31 17:32:49 +00:00

posting.php

#57715 - Correct behavior of "force_approved_state" when value is false.

2010-02-18 04:57:23 +00:00

report.php

Fix Bug #54375 - Show correct HTML title when reporting private messages.

2009-11-24 14:27:17 +00:00

search.php

Fix bug #51585 - Search loginbox or auth message differs

2010-01-18 15:50:13 +00:00

style.php

PHP 5.3 compatibility: Disable E_DEPRECATED on startup to keep set_magic_quotes_runtime(0) quiet. [Bug #54495]

2009-12-06 02:30:24 +00:00

ucp.php

We only remove board cookies (this is what the feature is supposed to do). This also solves issues with headers having > 20 Set-Cookie calls (which in turn breaks varnish 2.0.4-rc1 too)

2009-09-03 09:25:16 +00:00

viewforum.php

Simplified login_box() and redirection after login. S_LOGIN_ACTION can now be used on every page. (Bug #50285)

2009-08-30 17:13:28 +00:00

viewonline.php

Fix bug #46215 - Adjust viewonline filename regular expression to be less strict.

2009-06-09 15:52:03 +00:00

viewtopic.php

Firebird based board can now access their global announcements, took a while to discover this one. #57525

2010-02-20 00:02:56 +00:00