diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-02-24 00:08:13 +0000 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-02-24 00:08:13 +0000 |
| commit | 82219d51c2cbd76bedf43836f5b2e1533780bba5 (patch) | |
| tree | b0aa2e2cc7cb37b40f23da13f75ee2cfe906fbad /phpBB/docs | |
| parent | 4c2421dc1e7209ac9e40fe51ffb58bd637a65f73 (diff) | |
| download | forums-82219d51c2cbd76bedf43836f5b2e1533780bba5.tar forums-82219d51c2cbd76bedf43836f5b2e1533780bba5.tar.gz forums-82219d51c2cbd76bedf43836f5b2e1533780bba5.tar.bz2 forums-82219d51c2cbd76bedf43836f5b2e1533780bba5.tar.xz forums-82219d51c2cbd76bedf43836f5b2e1533780bba5.zip | |
Merge r10528 into 3.0.7: 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]
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10533 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/docs')
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 494d325e2b..335628cac6 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -164,6 +164,7 @@ <li>[Fix] BBCode parser now uses the user object for all settings rather than taking some from the template object (Bug #57365)</li> <li>[Fix] Ensure a database connection is available before logging general errors. (Bug #57975)</li> <li>[Fix] Do not delete unrelated attachments when deleting empty forums. (Bug #57375)</li> + <li>[Fix] 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)</li> <li>[Change] Move redirect into a hidden field to avoid issues with mod_security. (Bug #54145)</li> <li>[Change] Log activation through inactive users ACP. (Bug #30145)</li> <li>[Change] Send time of last item instead of current time in ATOM Feeds. (Bug #53305)</li> |