aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developOleg Pudeyev2011-12-032-46/+8
|\ | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10349] Removed duplicated functions from schema loading in tests [ticket/10349] Update function comment [ticket/10349] Use new schema comment function in installer [ticket/10349] Unit tests: Consolidate schema comment removal functions [ticket/10349] Unit tests: Remove comments while loading schema files
| * Merge remote-tracking branch 'Noxwizard/ticket/10349' into develop-olympusOleg Pudeyev2011-12-032-46/+8
| |\ | | | | | | | | | | | | | | | | | | | | | | | | * Noxwizard/ticket/10349: [ticket/10349] Removed duplicated functions from schema loading in tests [ticket/10349] Update function comment [ticket/10349] Use new schema comment function in installer [ticket/10349] Unit tests: Consolidate schema comment removal functions [ticket/10349] Unit tests: Remove comments while loading schema files
| | * [ticket/10349] Removed duplicated functions from schema loading in testsPatrick Webster2011-10-291-1/+0
| | | | | | | | | | | | PHPBB3-10349
| | * [ticket/10349] Use new schema comment function in installerPatrick Webster2011-09-282-46/+9
| | | | | | | | | | | | | | | | | | | | | This is what now runs in the unit tests. The COMMENTS field in the dbms data is no longer needed, so it has been removed. PHPBB3-10349
* | | Merge remote-tracking branch 'nickvergessen/ticket/develop/10345' into developOleg Pudeyev2011-12-0331-197/+371
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/develop/10345: (21 commits) [ticket/10345] Check directly whether the key to use exists [ticket/10345] Return the language key when the key has an empty array [ticket/10345] Document behaviour for floating numbers on phpbb_get_plural_form [ticket/10345] Remove doubled check for valid plural rule [ticket/10345] Add documentation and phpbb_ prefix to the new avatar functions [ticket/10345] Add cases for 1 pixel height on MAX_FLASH and MAX_IMG sizes [ticket/10345] Fix parsing error in language/en/viewtopic.php [ticket/10345] Move rule determination code into a new function [ticket/10345] Fix little type in unit test [ticket/10345] Remove more useless 0-cases [ticket/10345] Make the use of the 0-case optional [ticket/10345] Remove some unused 0 cases [ticket/10345] Fix some last use cases of sprintf() to use $user->lang() [ticket/10345] Add tests for array() as first parameter on call to $user->lang() [ticket/10345] Fix some documentation issues. [ticket/10345] Allow float as array key and add some tests [ticket/10345] Use the plural function in some more places. [ticket/10345] Make use of the plural function in some basic places [ticket/10345] Remove '1 hour ago' string which conflicted with plural rules [ticket/10345] Fix documentation on the new function and the switch ...
| * | | [ticket/10345] Check directly whether the key to use existsJoas Schilling2011-11-301-8/+16
| | | | | | | | | | | | | | | | PHPBB3-10345
| * | | [ticket/10345] Return the language key when the key has an empty arrayJoas Schilling2011-11-301-0/+5
| | | | | | | | | | | | | | | | PHPBB3-10345
| * | | [ticket/10345] Document behaviour for floating numbers on phpbb_get_plural_formJoas Schilling2011-11-302-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | The numbers are floored by casting to int. PHPBB3-10345
| * | | [ticket/10345] Remove doubled check for valid plural ruleJoas Schilling2011-11-301-4/+0
| | | | | | | | | | | | | | | | PHPBB3-10345
| * | | [ticket/10345] Add documentation and phpbb_ prefix to the new avatar functionsJoas Schilling2011-11-305-14/+26
| | | | | | | | | | | | | | | | PHPBB3-10345
| * | | [ticket/10345] Move rule determination code into a new functionJoas Schilling2011-11-252-153/+173
| | | | | | | | | | | | | | | | PHPBB3-10345
| * | | [ticket/10345] Make the use of the 0-case optionalJoas Schilling2011-11-251-34/+40
| | | | | | | | | | | | | | | | | | | | | | | | And correctly determinate the rule otherwise PHPBB3-10345
| * | | [ticket/10345] Fix some last use cases of sprintf() to use $user->lang()Joas Schilling2011-11-253-6/+6
| | | | | | | | | | | | | | | | PHPBB3-10345
| * | | [ticket/10345] Fix some documentation issues.Joas Schilling2011-11-251-5/+5
| | | | | | | | | | | | | | | | PHPBB3-10345
| * | | [ticket/10345] Allow float as array key and add some testsJoas Schilling2011-11-251-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | Added tests for the fallback when a key is missing and the float-feature. PHPBB3-10345
| * | | [ticket/10345] Use the plural function in some more places.Joas Schilling2011-11-2514-59/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | I added two function avatar_explanation_string() and avatar_error_wrong_size() for easier handling of the "pixels"-languages, as they are used quite often. PHPBB3-10345
| * | | [ticket/10345] Make use of the plural function in some basic placesJoas Schilling2011-11-2520-122/+54
| | | | | | | | | | | | | | | | PHPBB3-10345
| * | | [ticket/10345] Remove '1 hour ago' string which conflicted with plural rulesJoas Schilling2011-11-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This message was only viewed for 1 second anyway, as floor($delta / 60) is only 60 for 3600 to 3660, but the code was limited to $delta <= 3600 PHPBB3-10345
| * | | [ticket/10345] Fix documentation on the new function and the switchJoas Schilling2011-11-251-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | Also do not min/max the value, but throw an error on an invalid Plural rule. PHPBB3-10345
| * | | [ticket/10345] Add a system to allow multiple plural formsJoas Schilling2011-11-251-1/+169
| | | | | | | | | | | | | | | | | | | | | | | | See http://wiki.phpbb.com/Plural_Rules for explanation and examples. PHPBB3-10345
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-271-5/+5
|\ \ \ \ | |/ / / |/| / / | |/ / | | | * develop-olympus: [ticket/10497] Fix SQL error when guest visits forum with unread topic
| * | Merge branch 'prep-release-3.0.10' into develop-olympusAndreas Fischer2011-11-271-5/+5
| |\ \ | | | | | | | | | | | | | | | | * prep-release-3.0.10: [ticket/10497] Fix SQL error when guest visits forum with unread topic
| | * \ Merge remote-tracking branch 'rxu/ticket/10497' into prep-release-3.0.10Andreas Fischer2011-11-271-5/+5
| | |\ \ | | | | | | | | | | | | | | | | | | | | * rxu/ticket/10497: [ticket/10497] Fix SQL error when guest visits forum with unread topic
| | | * | [ticket/10497] Fix SQL error when guest visits forum with unread topicrxu2011-11-271-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regression from the ticket PHPBB3-9008 fix. When topic marking was enabled for guests, and a guest visited a forum with a new topic which is marked unread, the built SQL missed an alias for a TOPICS_TABLE which resulted in the following error: Unknown column 't.topic_approved' in 'where clause' [1054] The fix is to add an alias for the table. PHPBB3-10497 PHPBB3-9008
| | * | | [prep-release-3.0.10] Bumping version number for 3.0.10-RC2.Andreas Fischer2011-11-261-1/+1
| | |/ /
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-251-11/+15
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-olympus: [ticket/10280] Change the display of user activation settings in the ACP.
| * | | [ticket/10280] Change the display of user activation settings in the ACP.RMcGirr832011-11-251-11/+15
| | | | | | | | | | | | | | | | | | | | | | | | Use a select box to be consistent with other settings. PHPBB3-10280
* | | | Merge remote-tracking branch 'nickvergessen/ticket/10484' into developOleg Pudeyev2011-11-244-26/+32
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10484: [ticket/10484] Use variables for sql_build_query() calls Conflicts: phpBB/includes/mcp/mcp_front.php
| * | | | [ticket/10484] Use variables for sql_build_query() callsJoas Schilling2011-11-214-26/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's easier for mods/extensions to extend the arrays. PHPBB3-10484
* | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-11-231-1/+5
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10461] Add a comment explaining the logic here. [ticket/10461] Correct $log_count check in view_log() so we show logs again.
| * | | | Merge branch 'prep-release-3.0.10' into develop-olympusOleg Pudeyev2011-11-231-1/+5
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | * prep-release-3.0.10: [ticket/10461] Add a comment explaining the logic here. [ticket/10461] Correct $log_count check in view_log() so we show logs again.
| | * | | [ticket/10461] Add a comment explaining the logic here.Oleg Pudeyev2011-11-231-0/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-10461
| | * | | [ticket/10461] Correct $log_count check in view_log() so we show logs again.Andreas Fischer2011-11-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We pass $log_count as false now when we do not need to know how many log entries there are. However when $log_count is false, $log_count == 0 will be true as well and thus we will return early with 0. PHPBB3-9874 PHPBB3-10461
| * | | | [develop-olympus] Increment version number to 3.0.11-dev in develop-olympus.Andreas Fischer2011-11-211-1/+1
| |/ / /
| * | | [develop-olympus] Bump version numbers for 3.0.10-RC1 release.Andreas Fischer2011-11-201-1/+1
| | | |
* | | | Merge remote-tracking branch 'igorw/ticket/10323' into developOleg Pudeyev2011-11-201-4/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * igorw/ticket/10323: [ticket/10323] slight potential performance improvement [ticket/10323] make finder work with PHP 5.2
| * | | | [ticket/10323] slight potential performance improvementIgor Wiedler2011-11-201-4/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-10323
| * | | | [ticket/10323] make finder work with PHP 5.2Igor Wiedler2011-11-191-1/+6
| | | | | | | | | | | | | | | | | | | | PHPBB3-10323
* | | | | Merge branch 'develop-olympus' into developIgor Wiedler2011-11-208-40/+26
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10446] Pass $config and $user via parameter to anti_abuse_headers(). [ticket/10446] Remove leftover $headers parameter from anti_abuse_headers(). [ticket/10446] RFC2047 encode user/server names in X-AntiAbuse headers. [ticket/10446] DRY X-AntiAbuse header addition. Conflicts: phpBB/includes/ucp/ucp_register.php
| * | | | [ticket/10446] Pass $config and $user via parameter to anti_abuse_headers().Andreas Fischer2011-11-208-13/+16
| | | | | | | | | | | | | | | | | | | | PHPBB3-10446
| * | | | [ticket/10446] Remove leftover $headers parameter from anti_abuse_headers().Andreas Fischer2011-11-201-1/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-10446
| * | | | [ticket/10446] RFC2047 encode user/server names in X-AntiAbuse headers.Oleg Pudeyev2011-11-201-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-10446
| * | | | [ticket/10446] DRY X-AntiAbuse header addition.Oleg Pudeyev2011-11-208-42/+24
| | | | | | | | | | | | | | | | | | | | PHPBB3-10446
* | | | | Merge remote-tracking branch 'nickvergessen/ticket/10344' into developOleg Pudeyev2011-11-204-12/+18
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10344: [ticket/10344] Add attachment icons to list of reported and queued posts/topics
| * | | | | [ticket/10344] Add attachment icons to list of reported and queued posts/topicsJoas Schilling2011-08-274-12/+18
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10344
* | | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-11-201-0/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | * develop-olympus: [ticket/10402] Fixed a formatting issue with report details.
| * | | | | Merge remote-tracking branch 'callumacrae/ticket/10402' into develop-olympusOleg Pudeyev2011-11-201-0/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * callumacrae/ticket/10402: [ticket/10402] Fixed a formatting issue with report details.
| | * | | | | [ticket/10402] Fixed a formatting issue with report details.Callum Macrae2011-10-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Line returns were being removed and links weren't being made clickable. This commit adds a line (contributed by AmigoJack) to retain the link breaks and make links clickable. PHPBB3-10402
* | | | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-11-191-3/+6
|\ \ \ \ \ \ \ | |/ / / / / / | | | | / / / | |_|_|/ / / |/| | | | | | | | | | | * develop-olympus: [ticket/10239] Correct undefined variable error. [ticket/10239] Add confirm box to backup restore.
| * | | | | Merge remote-tracking branch 'cs278/ticket/10239' into develop-olympusOleg Pudeyev2011-11-191-3/+6
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * cs278/ticket/10239: [ticket/10239] Correct undefined variable error. [ticket/10239] Add confirm box to backup restore.