Joas Schilling 697fd5a134 Fix #51285 and more issues with template inherence on set_custom_template ...

Conflict introduced with r9839 and r9823

Authorised by: AcydBurn

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

2009-09-16 08:11:52 +00:00

..

acm

Fix some issues with XCache, can't totally resolve the purge() method as XCache does not expose its settings to userland PHP. #46435

2009-06-13 13:14:27 +00:00

acp

Fix #51305 - User need a_clearlog to delete warnings

2009-09-15 09:45:05 +00:00

auth

#51395 - remove legacy captcha code. authorised by: acyd burn

2009-09-15 09:08:37 +00:00

captcha

beautify q&a captcha a bit (only slightly)

2009-09-07 11:57:58 +00:00

db

- replaced the drop down menu log filter thing with log searching

2009-08-21 21:47:19 +00:00

diff

phpBB updater now skips sole whitespace changes. This reduces the chance of conflicts tremendously.

2009-09-04 14:50:05 +00:00

hooks

- fixed database updater

2007-10-04 12:03:05 +00:00

mcp

fix #49625 r10002 - Do not drop forum_id on mcp_front (un)approval

2009-09-12 13:17:58 +00:00

questionnaire

also collect admins user agent vendor and version (send_statistics)

2009-09-10 13:30:47 +00:00

search

correct method comment

2009-08-31 12:07:18 +00:00

ucp

rollback; will be in 3.0.7

2009-09-11 14:38:23 +00:00

utf

- replaced the drop down menu log filter thing with log searching

2009-08-21 21:47:19 +00:00

auth.php

Fix Bug #48875 - we compare the bitlength, therefore we indeed do not need to re-cache if we think acl options got changed (which we did)

2009-07-30 14:35:29 +00:00

bbcode.php

Fix #51285 and more issues with template inherence on set_custom_template

2009-09-16 08:11:52 +00:00

cache.php

Further word censor fix to work with UTF8 correctly

2009-07-07 12:59:30 +00:00

constants.php

Change version numbers to 3.0.6 and 3.0.6-RC1 for a final internal test run

2009-09-04 15:19:26 +00:00

functions_admin.php

fix uninitialised variable in functions_admin.php (Bug #51295)

2009-09-15 12:58:23 +00:00

functions_compress.php

Fix bugs #46615 & #46945 - Fail gracefully if store folder is not writable during update.

2009-07-17 11:32:27 +00:00

functions_content.php

Allow "0" as censor word and replacement.

2009-08-21 09:44:55 +00:00

functions_convert.php

Apply locale-independent basename() to attachment filenames. New function added: utf8_basename(). (Bug #43335 - Patch by ocean=Yohsuke)

2009-08-01 12:28:50 +00:00

functions_display.php

Further adjust unread tracking query, should work now for user last mark times less than forum/topic mark times.

2009-09-08 10:36:22 +00:00

functions_install.php

Lifted minimum requirement for Firebird DBMS from 2.0+ to 2.1+.

2009-08-13 15:25:20 +00:00

functions_jabber.php

[Feature] Allow specific connection to different server for jabber functionality by providing a valid JID as username. This also allows the use of talk.google.com as jabber server with gmail.com JIDs. (Bug #14989)

2008-10-08 12:44:23 +00:00

functions_messenger.php

Fix #51285 and more issues with template inherence on set_custom_template

2009-09-16 08:11:52 +00:00

functions_module.php

[Change] Alllow applications to set custom module inclusion path (idea by HoL)

2008-11-23 12:42:34 +00:00

functions_posting.php

Ability to define constant PHPBB_USE_BOARD_URL_PATH to use board url for images/avatars/ranks/imageset...

2009-08-17 14:45:14 +00:00

functions_privmsgs.php

Bug #39505, r9677 - Add integer casting and allow array to be empty. Unset array when no longer needed.

2009-09-03 13:44:16 +00:00

functions_profile_fields.php

Permit null values for non-required integer custom profile fields and ensure zero complies with the range limits. #40925

2009-07-19 00:20:03 +00:00

functions_template.php

Revert INC/DEC feature. It is not consistent with the other template variables - bad idea. ;) We will get to it though... but not now.

2009-08-30 11:15:24 +00:00

functions_transfer.php

Also fix bug #46295 in ftp_fsock class.

2009-07-22 03:02:45 +00:00

functions_upload.php

why am i so dumb sometimes... /me hits myself with the dumbness stick...

2009-09-13 14:31:32 +00:00

functions_user.php

Also update newest user data if someone is creating a founder with user_add().

2009-09-04 12:04:30 +00:00

functions.php

move up the feed code because MODs often use this location which results in more unneccessary conflicts.

2009-09-16 07:51:26 +00:00

index.htm

…

message_parser.php

fix #51235 - regression from 9843 for #48265

2009-09-13 15:04:21 +00:00

session.php

- fixed bug #44975

2009-09-04 14:53:35 +00:00

template.php

Fix #51285 and more issues with template inherence on set_custom_template

2009-09-16 08:11:52 +00:00