aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developOleg Pudeyev2011-04-301-0/+7
|\ | | | | | | | | * develop-olympus: [ticket/9961] Create log entries when users are activated.
| * Merge branch 'erikfrerejean/ticket/9961' into develop-olympusOleg Pudeyev2011-04-301-0/+7
| |\ | | | | | | | | | | | | * erikfrerejean/ticket/9961: [ticket/9961] Create log entries when users are activated.
| | * [ticket/9961] Create log entries when users are activated.Erik Frèrejean2011-04-191-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Create log entries when a user activates own account without also changing their password. * Additionally create admin log entries when an administrator activates user accounts. PHPBB3-9961
* | | Merge branch 'develop-olympus' into developIgor Wiedler2011-04-261-1/+1
|\ \ \ | |/ / | | | | | | | | | * develop-olympus: [ticket/10145] Always recompile all templates when DEBUG_EXTRA is defined.
| * | Merge remote branch 'bantu/ticket/10145' into develop-olympusIgor Wiedler2011-04-261-1/+1
| |\ \ | | | | | | | | | | | | | | | | * bantu/ticket/10145: [ticket/10145] Always recompile all templates when DEBUG_EXTRA is defined.
| | * | [ticket/10145] Always recompile all templates when DEBUG_EXTRA is defined.Andreas Fischer2011-04-261-1/+1
| | | | | | | | | | | | | | | | PHPBB3-10145
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-04-261-0/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-olympus: [ticket/7941] Added @return to generate_board_url docstring.
| * | | Merge remote branch 'p/ticket/7941' into develop-olympusAndreas Fischer2011-04-261-0/+3
| |\ \ \ | | |/ / | |/| | | | | | | | | | * p/ticket/7941: [ticket/7941] Added @return to generate_board_url docstring.
| | * | [ticket/7941] Added @return to generate_board_url docstring.Oleg Pudeyev2011-04-171-0/+3
| | |/ | | | | | | | | | PHPBB3-7941
* | | Merge branch 'feature/rxu/attachment-management-no-reassignment' into developOleg Pudeyev2011-04-243-1/+231
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * feature/rxu/attachment-management-no-reassignment: [feature/attachment-management-no-reassignment] Handle privacy and some more. [feature/attachment-management-no-reassignment] Further feature adjustments. [feature/attachment-management-no-reassignment] Fix some more errors [feature/attachment-management-no-reassignment] Fix minor flaws in the code. [feature/attachment-management-no-reassignment] Attachments management
| * | | [feature/attachment-management-no-reassignment] Handle privacy and some more.rxu2011-04-242-9/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - restrict files info for PM attachments; - add an option to resync files stats if wrong; - replace post_id sorting with post type (PM/regular post) one; - some language fixes. PHPBB3-9721
| * | | [feature/attachment-management-no-reassignment] Further feature adjustments.rxu2011-04-112-20/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -add database update entry; - add files statistics checks; - improve files deletion procedure; - improve reversed order for pagination; - adjust template file; - add missing comma for orphan key in info module; - change module mode name; - fix module explanation text; - add files comments output; - change attachments per page amount from posts to topics per page value. PHPBB3-9721
| * | | [feature/attachment-management-no-reassignment] Fix some more errorsrxu2011-04-112-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Missing comma for orphan key in info module, define $start variable PHPBB3-9721
| * | | [feature/attachment-management-no-reassignment] Fix minor flaws in the code.rxu2011-04-101-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | Thanks to Oleg for inspection. PHPBB3-9721
| * | | [feature/attachment-management-no-reassignment] Attachments managementrxu2011-04-102-0/+155
| | | | | | | | | | | | | | | | | | | | | | | | This feature allows to manage attachments in posts and PMs via ACP. PHPBB3-9721
* | | | [ticket/10148] Turn TEMPLATE_BITFIELD into an instance variable.Oleg Pudeyev2011-04-241-2/+2
| | | | | | | | | | | | | | | | PHPBB3-10148
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-04-231-1/+1
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * develop-olympus: [ticket/10147] Corrected a typo in includes/functions_template.php.
| * | | Merge branch 'ticket/p/10147' into develop-olympusAndreas Fischer2011-04-231-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/p/10147: [ticket/10147] Corrected a typo in includes/functions_template.php.
| | * | | [ticket/10147] Corrected a typo in includes/functions_template.php.Oleg Pudeyev2011-04-231-1/+1
| | | |/ | | |/| | | | | | | | | PHPBB3-10147
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-04-221-1/+11
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10141] Save a hash lookup when value is not in cache. [ticket/10141] Split double-assignment into conditional and unconditional part. [ticket/10141] Use a cache in $auth->_fill_acl() for better performance.
| * | | [ticket/10141] Save a hash lookup when value is not in cache.Oleg Pudeyev2011-04-211-3/+7
| | | | | | | | | | | | | | | | PHPBB3-10141
| * | | [ticket/10141] Split double-assignment into conditional and unconditional part.Andreas Fischer2011-04-221-7/+5
| | | | | | | | | | | | | | | | PHPBB3-10141
| * | | [ticket/10141] Use a cache in $auth->_fill_acl() for better performance.Bart van Bragt2011-04-211-2/+10
| |/ / | | | | | | | | | | | | | | | | | | Many sequences being converted are the same. Use a local cache to convert each sequence once, speeding up the function. PHPBB3-10141
* | | [ticket/10139] Make signatures of set_atomic() consistent by using $new_value.Andreas Fischer2011-04-191-3/+3
| | | | | | | | | | | | PHPBB3-10139
* | | [ticket/10139] Rename $cache to $use_cache to avoid confusion with cache objectAndreas Fischer2011-04-192-32/+32
| | | | | | | | | | | | PHPBB3-10139
* | | Merge branch 'ticket/erikfrerejean/10006' into developOleg Pudeyev2011-04-192-0/+35
|\ \ \
| * | | [ticket/10006] Remove unneeded if statementsErik Frèrejean2011-04-182-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | Remove some of the additional `if (isset)` checks PHPBB3-10006
| * | | [ticket/10006] Remove return valuesErik Frèrejean2011-04-182-11/+4
| | | | | | | | | | | | | | | | | | | | | | | | Remove some unneeded return values PHPBB3-10006
| * | | [ticket/10006] Add phpbb_config::deleteErik Frèrejean2011-04-182-0/+52
| | | | | | | | | | | | | | | | | | | | | | | | Add the missing `phpbb_config::delete` method to the config class PHPBB3-10006
* | | | [ticket/7252] Removed an outdated comment pertaining to PHP 4.x.Oleg Pudeyev2011-04-171-1/+0
| | | | | | | | | | | | | | | | PHPBB3-7252
* | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-04-171-25/+26
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * develop-olympus: [ticket/10109] Fix "Undefined Index" errors when copying a topic.
| * | | Merge branch 'ticket/nickvergessen/10109' into develop-olympusOleg Pudeyev2011-04-171-25/+26
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/10109: [ticket/10109] Fix "Undefined Index" errors when copying a topic.
| | * | | [ticket/10109] Fix "Undefined Index" errors when copying a topic.Joas Schilling2011-04-071-25/+26
| | | | | | | | | | | | | | | | | | | | PHPBB3-10109
* | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2007-01-031-15/+20
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | | | | | | | | | | | | | | * develop-olympus: [ticket/10117] Add one more missed 'u' modifier, add code comment [ticket/10115] Switch UTF-8 mode on for the rest of BBCodes [ticket/10117] Make smilies to be correctly parsed within unicode text. [ticket/10115] Make some text oriented BBCodes to properly handle unicode.
| * | | Merge branch 'ticket/rxu/10117' into develop-olympusOleg Pudeyev2011-04-171-2/+7
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/rxu/10117: [ticket/10117] Add one more missed 'u' modifier, add code comment [ticket/10117] Make smilies to be correctly parsed within unicode text.
| | * | | [ticket/10117] Add one more missed 'u' modifier, add code commentrxu2011-04-031-1/+6
| | | | | | | | | | | | | | | | | | | | PHPBB3-10117
| | * | | [ticket/10117] Make smilies to be correctly parsed within unicode text.rxu2011-04-031-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-10117
| * | | | Merge branch 'ticket/rxu/10115' into develop-olympusOleg Pudeyev2011-04-171-13/+13
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/rxu/10115: [ticket/10115] Switch UTF-8 mode on for the rest of BBCodes [ticket/10115] Make some text oriented BBCodes to properly handle unicode.
| | * | | | [ticket/10115] Switch UTF-8 mode on for the rest of BBCodesrxu2011-04-031-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10115
| | * | | | [ticket/10115] Make some text oriented BBCodes to properly handle unicode.rxu2011-04-021-7/+7
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | [quote], [b], [i], [size], [color], [u], [list] are affected. PHPBB3-10115
* | | | | Merge remote-tracking branch 'p/ticket/10136' into developIgor Wiedler2011-04-111-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/10136: [ticket/10136] Added missing $request globalizations in functions.php.
| * | | | | [ticket/10136] Added missing $request globalizations in functions.php.Oleg Pudeyev2011-04-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10136
* | | | | | Merge branch 'ticket/nickvergessen/9684' into developOleg Pudeyev2011-04-1111-572/+125
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9684: [ticket/9684] Also display forum-name in subsilver2 template [ticket/9684] Move currently existing GAs to a selectable forum while updating. [ticket/9684] View origin-forumname for GAs in topic-list [ticket/9684] Fix Forum/Topic-Tracking for global announcements [ticket/9684] Fix a SQL-Error in the posting.php [ticket/9684] Remove code in some more files especially includes/ [ticket/9684] Remove code for global announcement in root-files
| * | | | | | [ticket/9684] Fix Forum/Topic-Tracking for global announcementsJoas Schilling2011-04-073-69/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Should be ready for intensive testing now. PHPBB3-9684
| * | | | | | [ticket/9684] Remove code in some more files especially includes/Joas Schilling2011-04-0710-347/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Topic-Tracking is still missing. PHPBB3-9684
| * | | | | | [ticket/9684] Remove code for global announcement in root-filesJoas Schilling2011-04-071-156/+13
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | PHPBB3-9684
* | | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-04-101-6/+6
|\ \ \ \ \ \ | |_|/ / / / |/| | / / / | | |/ / / | |/| | | | | | | | * develop-olympus: [ticket/10128] Pass E_USER_WARNING to trigger_error() calls from user_ban(). [ticket/10123] Change "smilie" to "smiley" as per our coding guidelines.
| * | | | Merge branch 'ticket/bantu/10128' into develop-olympusOleg Pudeyev2011-04-101-6/+6
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/10128: [ticket/10128] Pass E_USER_WARNING to trigger_error() calls from user_ban().
| | * | | | [ticket/10128] Pass E_USER_WARNING to trigger_error() calls from user_ban().Andreas Fischer2011-04-111-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The user_ban() function is shared by the MCP and the ACP. Mark trigger_error() calls as errors by passing E_USER_WARNING to make the error message appear on red background (instead of green background) in the ACP. PHPBB3-10128
* | | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-04-101-10/+35
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9581] Fix missing index [ticket/9581] Slightly tweaked queries [ticket/9581] Make banlist table select optional [ticket/9581] Mass e-mail to banned users