aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* [feature/compiled-dic] Fix cron tasks againDavid King2012-11-103-104/+15
| | | | PHPBB3-11152
* [feature/compiled-dic] Fix cron task loadingDavid King2012-11-103-10/+127
| | | | | | | | We cannot use container tags at run time if we are using a cached, compiled container object (i.e. phpbb_cache_container) so we have to load them beforehand. PHPBB3-11152
* [feature/compiled-dic] Remove HttpKernel-related stuffDavid King2012-11-102-166/+0
| | | | | | These things should be added in the Controller PR instead. PHPBB3-11152
* [feature/compiled-dic] Remove unused function parameterDavid King2012-11-101-1/+1
| | | | PHPBB3-11152
* [feature/compiled-dic] Remove unused service definitionDavid King2012-11-101-1/+0
| | | | PHPBB3-11152
* [feature/compiled-dic] Split if() over multiple lines for improved readabilityDavid King2012-11-102-2/+10
| | | | PHPBB3-11152
* [feature/compiled-dic] Compile the DI Container into a cached classDavid King2012-11-1013-225/+456
| | | | PHPBB3-11152
* Merge remote-tracking branch 'github-p/ticket/11174' into developNils Adermann2012-11-091-0/+4
|\ | | | | | | | | | | | | | | | | * github-p/ticket/11174: [ticket/11174] Check common words, fix array equality assertion. [ticket/11174] Test for common words. [ticket/11174] More tests. [ticket/11174] Clarify why that is the way it is. [ticket/11174] Started on search tests - keyword splitting.
| * [ticket/11174] Started on search tests - keyword splitting.Oleg Pudeyev2012-11-081-0/+4
| | | | | | | | PHPBB3-11174
* | Merge remote-tracking branch 'github-p/feature/prune-users' into developNils Adermann2012-11-094-149/+275
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-p/feature/prune-users: (21 commits) [feature/prune-users] $author_id_sql is no longer needed here. [feature/prune-users] Move quote to the correct line. [feature/prune-users] Split one line into two lines for readability. [feature/prune-users] Use empty for checking array size. [feature/prune-users] Fix issues with queries pointed out by bantu. [feature/prune-users] Add spaces inside brackets. [feature/prune-users] Use a map instead of performing array scans. [feature/prune-users] Fix incorrect condition when deleting log entries. [feature/prune-users] Non-cosmetic changes per bantu's review. [feature/prune-users] Cosmetic changes per bantu's review. [feature/prune-users] Minor UI adjustment and bug fixes [feature/prune_users] Moved set_config_count out of user loop. [feature/prune-users] Fixed user id check in undelivered users loop. [feature/prune-users] Call sql_is_set once for author ids in user_delete. [feature/prune-users] Replaced missed occurrences of $user_id with $user_ids. [feature/prune-users] Call sql_is_set for user ids once in user_delete. [feature/prune-users] Fixed whitespace in language file. [feature/prune-users] Apply 904bcb86a054ab6256da565098eb9bd8ab20414b. [feature/prune-users] Adjust some language strings for new features [feature/prune-users] Apply e6ed55a9c1ceb07ab2e87d4a53f9e688fda319c5. ...
| * | [feature/prune-users] $author_id_sql is no longer needed here.Oleg Pudeyev2012-11-061-2/+0
| | | | | | | | | | | | PHPBB3-9622
| * | Merge remote-tracking branch 'upstream/develop' into feature/prune-usersOleg Pudeyev2012-11-06246-9046/+18021
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: (2171 commits) [ticket/11164] Update composer.phar [ticket/10933] Use inheritDoc, eliminate copy pasted docblocks. [ticket/10933] Dependency inject template context. [ticket/10933] Expanded prose documentation for phpbb_extension_provider. [ticket/10933] Specify empty template path for absolute includephp test. [ticket/10933] Useful documentation for template locate function [ticket/10933] Typo fixes [ticket/10933] Initialize template context when template is constructed. [ticket/11099] Mark acp_ban::display_ban_options() as static. [ticket/11158] Require acl_u_sig for ucp signature module. [ticket/11158] Revert old fix in PHPBB3-10186. [ticket/11159] static public is the currently approved order. [ticket/11157] static public is the currently approved order. [ticket/11157] Fix remaining captcha spam. [ticket/11157] get_captcha_types is an instance method. [ticket/11156] Delete "Misc" tab of forum based permissions + move items [ticket/10848] Move include up. [ticket/11014] Fix old pagination assignment [ticket/11018] Fix several paginations in ACP [ticket/11014] Fix IF statements for new template pagination ... Conflicts: phpBB/includes/functions_user.php
| * | | [feature/prune-users] Move quote to the correct line.Oleg Pudeyev2012-04-251-2/+2
| | | | | | | | | | | | | | | | PHPBB3-9622
| * | | [feature/prune-users] Split one line into two lines for readability.Oleg Pudeyev2012-04-191-1/+2
| | | | | | | | | | | | | | | | PHPBB3-9622
| * | | [feature/prune-users] Use empty for checking array size.Oleg Pudeyev2012-04-191-1/+1
| | | | | | | | | | | | | | | | PHPBB3-9622
| * | | [feature/prune-users] Fix issues with queries pointed out by bantu.Oleg Pudeyev2012-04-191-2/+6
| | | | | | | | | | | | | | | | PHPBB3-9622
| * | | [feature/prune-users] Use a map instead of performing array scans.Oleg Pudeyev2012-04-191-2/+4
| | | | | | | | | | | | | | | | PHPBB3-9622
| * | | [feature/prune-users] Fix incorrect condition when deleting log entries.Oleg Pudeyev2012-04-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original commit incorrectly replaced reportee_id with user_id. Change it back to reportee_id. The comment was correct. PHPBB3-9622
| * | | [feature/prune-users] Non-cosmetic changes per bantu's review.Oleg Pudeyev2012-04-192-6/+6
| | | | | | | | | | | | | | | | PHPBB3-9622
| * | | [feature/prune-users] Cosmetic changes per bantu's review.Oleg Pudeyev2012-03-252-7/+7
| | | | | | | | | | | | | | | | PHPBB3-9622
| * | | [feature/prune-users] Minor UI adjustment and bug fixesjellydoughnut2012-01-061-14/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed unneeded hidden fields in confirmation page. Do not show group prune dropdown if there are no groups, etc. PHPBB3-9622
| * | | [feature/prune_users] Moved set_config_count out of user loop.Oleg Pudeyev2011-05-081-1/+8
| | | | | | | | | | | | | | | | PHPBB3-9622
| * | | [feature/prune-users] Fixed user id check in undelivered users loop.Oleg Pudeyev2011-05-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | There is now $user_ids instead of one $user_id. PHPBB3-9622
| * | | [feature/prune-users] Call sql_is_set once for author ids in user_delete.Oleg Pudeyev2011-05-081-4/+6
| | | | | | | | | | | | | | | | PHPBB3-9622
| * | | [feature/prune-users] Replaced missed occurrences of $user_id with $user_ids.Oleg Pudeyev2011-05-081-2/+2
| | | | | | | | | | | | | | | | PHPBB3-9622
| * | | [feature/prune-users] Call sql_is_set for user ids once in user_delete.Oleg Pudeyev2011-05-081-7/+9
| | | | | | | | | | | | | | | | PHPBB3-9622
| * | | Merge branch 'develop' into feature/prune-usersOleg Pudeyev2011-05-0851-1396/+2084
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop: (170 commits) [ticket/10145] Always recompile all templates when DEBUG_EXTRA is defined. [feature/attachment-management-no-reassignment] Handle privacy and some more. [ticket/10148] Turn TEMPLATE_BITFIELD into an instance variable. [ticket/10147] Corrected a typo in includes/functions_template.php. [ticket/10141] Save a hash lookup when value is not in cache. [ticket/10143] Added tests for storing a previously deleted value in db cache. [ticket/10105] Update AIM express link. [ticket/10105] Update AIM application download link. [ticket/10137] Remove unintended space at end of PHP_URL_FOPEN_SUPPORT_EXPLAIN. [ticket/10141] Split double-assignment into conditional and unconditional part. [ticket/10141] Use a cache in $auth->_fill_acl() for better performance. [ticket/9961] Create log entries when users are activated. [ticket/10139] Make signatures of set_atomic() consistent by using $new_value. [ticket/10139] Rename $cache to $use_cache to avoid confusion with cache object [ticket/10006] Remove unneeded if statements [ticket/10006] Remove return values [ticket/10006] More testing [ticket/10006] Tweak the tests a bit [ticket/10006] Add phpbb_config::delete [ticket/7941] Added @return to generate_board_url docstring. ...
| * | | | [feature/prune-users] Apply 904bcb86a054ab6256da565098eb9bd8ab20414b.Oleg Pudeyev2011-05-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was done in PHPBB3-7834. PHPBB3-9622
| * | | | Merge commit '441755bf170e49799e311c71b2123ff263970d62' into feature/prune-usersOleg Pudeyev2011-05-084-14/+18
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '441755bf170e49799e311c71b2123ff263970d62': [ticket/9874] view_log() performs unneeded count query over all log entries.
| * | | | | [feature/prune-users] Adjust some language strings for new featuresJosh Woody2011-05-081-27/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjust two language strings for ACP prune feature to include descriptions for new features. PHPBB3-9622
| * | | | | [feature/prune-users] Apply e6ed55a9c1ceb07ab2e87d4a53f9e688fda319c5.Oleg Pudeyev2011-05-081-40/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was done in PHPBB3-9872. PHPBB3-9622
| * | | | | [feature/prune-users] Rework user_delete() functions_user.phpJosh Woody2011-05-083-126/+149
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | user_delete now uses fewer queries to delete a set of users of size > 1 by accepting an array of users rather than a single user at a time. This required changing the third parameter, however the function retains its former behavior with the old-style parameters. PHPBB3-9622
* | | | | | Merge remote-tracking branch 'p/ticket/11159' into developAndreas Fischer2012-11-082-2/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | * p/ticket/11159: [ticket/11159] Static public is the currently approved order.
| * | | | | [ticket/11159] Static public is the currently approved order.Oleg Pudeyev2012-11-062-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11159
* | | | | | [ticket/11154] Do not try to load any extensions when installing.Oleg Pudeyev2012-11-071-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Might be the right fix, might be not. Works for me. PHPBB3-11154
* | | | | | Merge PR #722 branch 'Senky/ticket/9918' into developOleg Pudeyev2012-11-062-6/+6
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | * Senky/ticket/9918: [ticket/9918] default values in request_var changed to one string [ticket/9918] $redirect variable used from now
| * | | | | [ticket/9918] default values in request_var changed to one stringSenky2012-04-152-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As per marc1706's note, all request_var functions now have only one string in default value PHPBB3-9918
| * | | | | [ticket/9918] $redirect variable used from nowSenky2012-04-092-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to comment marc1706 added to tracker http://tracker.phpbb.com/browse/PHPBB3-9918?focusedCommentId=35120&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-35120 I changed files to fit his second advice - redirect is kept in hidden_fields and other code changed. PHPBB3-9918
* | | | | | Merge PR #786 branch 'brunoais/ticket/10845' into developOleg Pudeyev2012-11-062-5/+3
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * brunoais/ticket/10845: [ticket/10845] Removed one empty line that wasn't supposed to be there [ticket/10845] Two of the three colouns were missing in the DB update file [ticket/10845] Remove censor from text [ticket/10845] Now it shows the preview post parsed [ticket/10845] Changed the report system. Now it saves posts with the bbcode Conflicts: phpBB/includes/functions_content.php
| * | | | | [ticket/10845] Remove censor from textBruno Ais2012-05-022-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to remove the censor, I added a new parameter to generate_text_for_display(), that new parameter is used to tell if the text should be censored or not. Defaults to true. PHPBB3-10845
| * | | | | [ticket/10845] Now it shows the preview post parsedBruno Ais2012-05-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With this addition, the preview post in the report details now shows with the BBCode parsed. Note: Tested with all BBCodes I have including one personalised to write the <s> BBCode. PHPBB3-10845
* | | | | | [ticket/10933] Use inheritDoc, eliminate copy pasted docblocks.Oleg Pudeyev2012-11-021-64/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10933
* | | | | | [ticket/10933] Dependency inject template context.Oleg Pudeyev2012-11-023-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10933
* | | | | | [ticket/10933] Expanded prose documentation for phpbb_extension_provider.Oleg Pudeyev2012-11-021-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10933
* | | | | | [ticket/10933] Useful documentation for template locate functionOleg Pudeyev2012-11-021-2/+34
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10933
* | | | | | [ticket/10933] Typo fixesOleg Pudeyev2012-11-022-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10933
* | | | | | [ticket/10933] Initialize template context when template is constructed.Oleg Pudeyev2012-11-022-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no apparent reason for either initializing or clearing the context in set_style/set_custom_style. Initially the initialization there was added in 0501640d5db158a010741e27803191ab469834c4, for reasons that presently I do not see. This permits making context property back private. PHPBB3-10933
* | | | | | [ticket/11099] Mark acp_ban::display_ban_options() as static.Andreas Fischer2012-10-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is called statically from mcp_ban. PHPBB3-11099
* | | | | | Merge remote-tracking branch 'p/ticket/11157' into developAndreas Fischer2012-10-306-15/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/11157: [ticket/11157] static public is the currently approved order. [ticket/11157] Fix remaining captcha spam. [ticket/11157] get_captcha_types is an instance method.
| * | | | | | [ticket/11157] static public is the currently approved order.Oleg Pudeyev2012-10-295-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11157
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-11 20:33:30 +0000