History | View | Annotate | Download (4.5 kB)
commit 1c95101284d1545443bf6070d2f9dbc2880165f6Merge: 08f6a12 a469e80Author: Andreas Fischer <bantu@phpbb.com>Date: Fri Jan 7 15:58:10 2011 +0100
Merge branch 'develop-olympus' into develop
commit adfa1656fb9d8b5bb601af1d7a6720884954d87aMerge: bd579c8 af5b9a9Author: Nils Adermann <naderman@naderman.de>Date: Mon Dec 13 16:35:55 2010 +0100
Merge branch 'ticket/igorw/9556' into develop
Copy 3.0.x branch to trunk
Allow "0" as censor word and replacement.Only obtain word censor list if text is not empty.
Hiding everywhere little buggers, eh?
This commit was manufactured by cvs2svn to create branch 'phpBB-3_0_0'.
dumdidum... sorry. ;)
Cleanup in aisle 15
Ok, here comes a big one. Poor updater. Also requires testing.
#i91#i92#i93#i94#i95#i96
changed the cache files to save some memory (all global ones are hold in memory, doubling it).
Unused Code inside function update_forum_data [Bug #6606]Copy permissions protection for groups [Bug #6594]HTML issues in ACP [Bug #6580, #6578]Always send the correct encoding [related to bug #6576]Mass email fixes for first loop iteration [Bug #6570]...
- fixes for the following bugs:#5326#5318#5304#5290#5288#5278#5276#5272#5266- also fixed the "Call-time pass-by-reference" bug #5252- within this step changed the normalize calls to require references.- added captcha size variables to the class scope (suggestion was posted at area51)
message
- some bugfixes- using E_USER_WARNING if an error occurred within the ACP (sadly not able to use it as a default for trigger_error - it seems to be hardcoded in PHP)
make sure custom profile fields are created correctly on registration (#2225)
ok, this one is rather large... the most important change:re-introduce append_sid: old style continues to work, not a performance hog as it was in 2.0.x -> structure is different
apart from this, code cleanage, bug fixing, etc.
To all people having their bug status set to fixed: SF pserver CVS access is currently down, therefore the snapshots are still out of date.
- fix a bunch of bugs- <!-- $Id$ --> is no longer allowed in template (.html) files- changed layout of private message screens (folders are menu items)...
ok, thought about this now for too long. I think the best solution circumventing memory consumption and not introducing "hacks" is to seperate module information (and probably more in 3.2 for installation/uninstallation) from the main code.
adjusting sql_freeresult a bit as well as our error handler (it now prints out if it is because of DEBUG_EXTRA being defined - which is not enabled within the betas/rc's and stable releases).
- fix some tiny bugs- fix module system (sometimes the layout is broken due to falsly deactivated categories)- auth updates (setting permissions)- fix "category jumping" bug in acp- u_action is defined by the module itself
- Buh? Incorrect lang index...
- more acp additions and changes...