History | View | Annotate | Download (14.2 kB)
commit ba41e45f84027ebcf8d5118f909cee2bf0b4ddd5Merge: aae3bd0 df92b7bAuthor: Oleg Pudeyev <oleg@bsdpower.com>Date: Wed Feb 23 22:03:42 2011 -0500
Merge branch 'develop-olympus' into develop
commit 6e51e52f0c0f34a5dea8e3e1730de039ed5895e6Merge: 90ccdb4 6b4d0a2Author: Andreas Fischer <bantu@phpbb.com>Date: Tue Dec 28 22:40:09 2010 +0100
Merge branch 'ticket/igorw/9574' 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
commit 693a2dc99bf07aeac1865d4a48ddf2589317ac7aMerge: b68de23 ac32927Author: Nils Adermann <naderman@naderman.de>AuthorDate: Wed Mar 3 23:32:09 2010 +0100Commit: Nils Adermann <naderman@naderman.de>CommitDate: Wed Mar 3 23:32:09 2010 +0100
Merge branch 'develop-olympus' into develop...
Copy 3.0.x branch to trunk
Catch too long help lines
Hiding everywhere little buggers, eh?
Fix Custom BBCode {EMAIL}-Token usage - #21155
This commit was manufactured by cvs2svn to create branch 'phpBB-3_0_0'.
- Match custom BBCodes in the same way during first and second pass - patch provided by IBBoard [Bug #14268]
dumdidum... sorry. ;)
Ok, here comes a big one. Poor updater. Also requires testing.
#i91#i92#i93#i94#i95#i96
- Prevent {URL} token in custom BBCodes from make_clickable messing [Bug #14151]- Added alternative tokens to custom BBCodes which are safe for CSS/Javascript and changed TEXT token to entitise opening and closing parantheses.
try to normalize everything...
#12473
#12377
ok, mess around with the templates + fixing some bugs + adjusting headers for those files already modified to circumvent conflicts for those having their editor set to remove trailing spaces (not recommended!)
#11255#11259#11291#11335#11457#11473#11475#11511#11523#11527
#10903
#8090
meh
#6772- some other random things
#6776
#5656
#5452
#5450
#5428
- 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)
ok, i am an idiot...
#5030
for some things we do not need the utf8 function. :)
tried to begin adjusting all string functions where applicable - still a lot to do.i hope i catched all relevant sections and did not mess something up.
#4226
kill the cache
consistent acp layout regarding backlinks and messages.
- added confirmation to removing bbcodes- added optional MX and DNSBL checks- added backtrace (triggering sql error) on error within sql_in_set as well as making sure it is handling an array- let users having f_list access to a forum actually see the forum without a topic list and not displaying an error message - this allows for giving people access to subforums but not the parent forum without the need to add the (sub-)forum to the index....
fix custom bbcode html replacement to correctly replace referencesIt failed if there was a number directly after the token, resulting in $12345, where $1 was needed. Fixed by using ${x}
also made sure that newlines within the html replacement are not replaced with <br />.
- 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)
bugfixes
heh
- load tracking updates. Need to be tested on a clean installation too - at the moment only tiny quirks are noticed at area51.- reported bugs fixed
- BBCode helpline is now customizable
OK...
This commit should increase the total number of BBCodes from 31 to 2040. Some things to watch out for:
Each database likes to deal with binary data in its own, special way. They are, quite frankly, too cool for school.
MySQL, MSSQL and Oracle all allow me to send in a default value for their binary column using a hex number. However, MSSQL forces me to send the specific data as a hex number and thus we must CAST it....
bugs? bugs.
- Some fixes
- removed db cache (might re-appear, but for now we do not see the need for it)- all changes to styles/subsilver/template are purely cosmetic (no functional changes)- cosmetics- bugfixes- add index to modules table- use modules ordering code for forums too
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.
- adjusted coding guidelines- fixed custom bbcode {TEXT} token- added unapproved item/info for unapproved posts in a topic
- fixing a few smaller bugs/glitches- init user session in cron.php (else it can produce errors if functions expect the user object being set)- fix sql escaping for mssql/mssql_odbc
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.
- a bunch of bugfixes. :P
- bbcode ids need to be greater than NUM_CORE_BBCODES
- added "display_on_posting" setting to custom bbcodes (creates a button with the bbcode tag)- fixed forum editing and parent id selection- completely removed HTML support (it only creates security problems)- changed cache_moderators() to reflect permission changes
- 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
- some SQL:2003 changes (basicly joins, mysql5 is sql:2003 compliant in strict mode now) - postgresql not supporting this standard. :/- acp changes
- more acp additions and changes...
