aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/10575] Fixing non-static access to static functions get_instanceBruno Ais2012-04-056-6/+6
| | | | | | | | These changes should solve the strict standards error about accessing the non-static get_instance() in a non-static way. For that, I changed the get_instance methods to static methods. PHPBB3-10575
* Merge remote-tracking branch 'imkingdavid/ticket/10535' into developOleg Pudeyev2012-02-033-23/+0
|\ | | | | | | | | | | | | | | | | | | * imkingdavid/ticket/10535: [ticket/10535] Delete no longer needed email confirm language entries. [ticket/10535] Delete email confirm from installer [ticket/10535] Removed email confirm field from acp_users module [ticket/10535] Forgot a subsilver2 change. *doh* [ticket/10535] Removed email confirm from UCP, removed unused language entries [ticket/10535] Remove email confirm check on registration form
| * [ticket/10535] Removed email confirm field from acp_users moduleDavid King2011-12-231-7/+0
| | | | | | | | PHPBB3-10535
| * [ticket/10535] Removed email confirm from UCP, removed unused language entriesDavid King2011-12-151-7/+0
| | | | | | | | PHPBB3-10535
| * [ticket/10535] Remove email confirm check on registration formDavid King2011-12-151-9/+0
| | | | | | | | PHPBB3-10535
* | Merge remote-tracking branch 'naderman/ticket/10477' into developAndreas Fischer2012-02-021-0/+15
|\ \ | | | | | | | | | | | | | | | | | | * naderman/ticket/10477: [ticket/10477] Correctly document module (base)name parameter [ticket/10477] Document parameters to p_master#load. [ticket/10477] Normalize loaded module names to be class names or xcp_ prefixed
| * | [ticket/10477] Correctly document module (base)name parameterNils Adermann2012-01-131-1/+2
| | | | | | | | | | | | PHPBB3-10477
| * | [ticket/10477] Document parameters to p_master#load.Oleg Pudeyev2012-01-131-1/+8
| | | | | | | | | | | | PHPBB3-10477
| * | [ticket/10477] Normalize loaded module names to be class names or xcp_ prefixedNils Adermann2012-01-061-0/+7
| | | | | | | | | | | | PHPBB3-10477
* | | Merge branch 'develop-olympus' into developAndreas Fischer2012-01-231-18/+2
|\ \ \ | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10580] Remove checking of server timezone and DST when registering
| * | | [ticket/10580] Remove checking of server timezone and DST when registeringRichard Foote2012-01-211-18/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove checking of server timezone and DST. It causes a problem by selecting the wrong timezone when registering when the board_timezone is 1 hour less than the server timezone. PHPBB3-10580
* | | | Merge pull request #531 from p/ticket/10579Igor Wiedler2012-01-121-1/+1
|\ \ \ \ | | | | | | | | | | [ticket/10579] Delete extra v2 from license block.
| * | | | [ticket/10579] Delete extra v2 from license block.Oleg Pudeyev2012-01-121-1/+1
| | |/ / | |/| | | | | | | | | | PHPBB3-10579
* | | | Merge branch 'develop-olympus' into developOleg Pudeyev2012-01-122-6/+13
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | * develop-olympus: [ticket/9079] Always log backtrace to error log when logging errors. [ticket/9079] Display backtrace on all E_USER_ERROR errors, not only SQL errors
| * | Merge remote-tracking branch 'bantu/ticket/9079' into develop-olympusOleg Pudeyev2012-01-122-6/+13
| |\ \ | | | | | | | | | | | | | | | | | | | | * bantu/ticket/9079: [ticket/9079] Always log backtrace to error log when logging errors. [ticket/9079] Display backtrace on all E_USER_ERROR errors, not only SQL errors
| | * | [ticket/9079] Always log backtrace to error log when logging errors.Oleg Pudeyev2011-12-241-4/+9
| | | | | | | | | | | | | | | | PHPBB3-9079
| | * | [ticket/9079] Display backtrace on all E_USER_ERROR errors, not only SQL errorsAndreas Fischer2011-12-242-5/+7
| | | | | | | | | | | | | | | | PHPBB3-9079
* | | | Merge branch 'develop-olympus' into developOleg Pudeyev2012-01-061-0/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-olympus: [ticket/10563] Show deactivated styles below active styles in acp
| * | | [ticket/10563] Show deactivated styles below active styles in acpVjacheslav Trushkin2012-01-021-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Separates active and deactivated styles in styles list in acp PHPBB3-10563
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-01-021-4/+8
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10407] Fix check for empty image paths in convertor [ticket/10407] Fix check for empty image paths in convertor
| * | | Merge remote-tracking branch 'Dickyf/ticket/10407a' into develop-olympusAndreas Fischer2012-01-021-4/+8
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * Dickyf/ticket/10407a: [ticket/10407] Fix check for empty image paths in convertor [ticket/10407] Fix check for empty image paths in convertor
| | * | | [ticket/10407] Fix check for empty image paths in convertorRichard Foote2012-01-021-16/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This applies to avatar_path,avatar_gallery_path,smilies_path and upload_path. Currently, the convertor gets each path from the config table and adds a trailing slash. If there is no entry in the config table for the path, the path can never be empty because of the added trailing slash. This patch will check the path without the trailing slash to see if the path is actually empty. PHPBB3-10407
| | * | | [ticket/10407] Fix check for empty image paths in convertorRichard Foote2011-12-291-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This applies to avatar_path,avatar_gallery_path,smilies_path and upload_path. Currently, the convertor gets each path from the config table and adds a trailing slash. If there is no entry in the config table for the path, the path can never be empty because of the added trailing slash. This patch will temporarily remove the trailing slash, then check if the path is empty. PHPBB3-10407
* | | | | [ticket/9916] Updating header license and removing Version $Id$Unknown2012-01-021-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-9916
* | | | | Merge remote-tracking branch 'unknownbliss/ticket/9916' into developAndreas Fischer2012-01-02218-393/+219
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * unknownbliss/ticket/9916: [ticket/9916] Updating header license and removing Version $Id$
| * | | | | [ticket/9916] Updating header license and removing Version $Id$Unknown2011-12-31218-393/+219
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9916
* | | | | | [ticket/10557] Added IN_PHPBB check to functions_acp.phpDavid King2011-12-281-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10557
* | | | | | Merge branch 'develop-olympus' into developIgor Wiedler2011-12-281-3/+3
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | * develop-olympus: [ticket/10538] Call htmlspecialchars_decode() on Jabber and SMTP passwords.
| * | | | | Merge remote-tracking branch 'bantu/ticket/10538' into develop-olympusIgor Wiedler2011-12-281-3/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10538: [ticket/10538] Call htmlspecialchars_decode() on Jabber and SMTP passwords.
| | * | | | | [ticket/10538] Call htmlspecialchars_decode() on Jabber and SMTP passwords.Andreas Fischer2011-12-191-3/+3
| | | |/ / / | | |/| | | | | | | | | | | | | | | PHPBB3-10538
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-12-251-0/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9681] Add password length to security settings
| * | | | | Merge remote-tracking branch 'p/ticket/9681' into develop-olympusAndreas Fischer2011-12-251-0/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/9681: [ticket/9681] Add password length to security settings
| | * | | | | [ticket/9681] Add password length to security settingsIgor Wiedler2011-12-231-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9681
* | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-12-252-48/+66
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10428] Documentation for optionget/optionset functions. [ticket/10428] Use phpbb_optionget/set in optionget/set for DRYness. [ticket/10428] Dispose of $this->keyvalues cache for optionget. [ticket/10428] Compare $data to false strictly.
| * | | | | | Merge remote-tracking branch 'p/ticket/10428' into develop-olympusAndreas Fischer2011-12-252-48/+66
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/10428: [ticket/10428] Documentation for optionget/optionset functions. [ticket/10428] Use phpbb_optionget/set in optionget/set for DRYness. [ticket/10428] Dispose of $this->keyvalues cache for optionget. [ticket/10428] Compare $data to false strictly.
| | * | | | | [ticket/10428] Documentation for optionget/optionset functions.Oleg Pudeyev2011-12-252-4/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10428
| | * | | | | [ticket/10428] Use phpbb_optionget/set in optionget/set for DRYness.Oleg Pudeyev2011-12-252-32/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10428
| | * | | | | [ticket/10428] Dispose of $this->keyvalues cache for optionget.Oleg Pudeyev2011-12-251-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It does not work properly when custom $data is provided, and making it work will make the code so complicated that any benefits from having this cache in the first place will be nullified. Just get rid of it. PHPBB3-10428
| | * | | | | [ticket/10428] Compare $data to false strictly.Oleg Pudeyev2011-12-252-8/+8
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Users may pass 0 or '' for $data, this should cause the user-specified $data code path to be taken. PHPBB3-10428
* | | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-12-241-1/+6
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10507] DBAL unit test [ticket/10507] Sort styles in acp Conflicts: phpBB/includes/acp/acp_styles.php
| * | | | | Merge remote-tracking branch 'cyberalien/ticket/10507' into develop-olympusOleg Pudeyev2011-12-241-1/+6
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * cyberalien/ticket/10507: [ticket/10507] DBAL unit test [ticket/10507] Sort styles in acp
| | * | | | | [ticket/10507] Sort styles in acpVjacheslav Trushkin2011-12-151-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sort styles by name in admin control panel PHPBB3-10507
* | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-12-231-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10546] Add missing argument to adm_back_link in acp_captcha.
| * | | | | | [ticket/10546] Add missing argument to adm_back_link in acp_captcha.Oleg Pudeyev2011-12-231-1/+1
| | |/ / / / | |/| | | | | | | | | | | | | | | | PHPBB3-10546
| * | | | | Merge remote-tracking branch 'cyberalien/ticket/10399' into develop-olympusOleg Pudeyev2011-12-221-10/+10
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | * cyberalien/ticket/10399: [ticket/10399] Correctly encoding template component urls (3.0) [ticket/10399] Correctly encoding template component urls (3.0)
| | * | | | [ticket/10399] Correctly encoding template component urls (3.0)Vjacheslav Trushkin2011-12-011-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correctly encoding template component urls PHPBB3-10399
* | | | | | Merge remote-tracking branch 'imkingdavid/ticket/10541' into developOleg Pudeyev2011-12-221-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * imkingdavid/ticket/10541: [ticket/10541] Fixed empty drop-down menu bug
| * | | | | | [ticket/10541] Fixed empty drop-down menu bugDavid King2011-12-211-1/+1
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | PHPBB3-10541
* | | | | | Merge remote-tracking branch 'cyberalien/ticket/develop/10399' into developOleg Pudeyev2011-12-221-7/+7
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | * cyberalien/ticket/develop/10399: [ticket/10399] Correctly encoding template component urls (3.1)
| * | | | | [ticket/10399] Correctly encoding template component urls (3.1)Vjacheslav Trushkin2011-12-011-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correctly encoding template component urls PHPBB3-10399
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 17:05:18 +0000