aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* [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
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-12-161-2/+16
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10531] Disallow deleting of the last style Conflicts: phpBB/includes/acp/acp_styles.php
| * | | | | Merge branch 'prep-release-3.0.10' into develop-olympusAndreas Fischer2011-12-161-2/+16
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.10: [ticket/10531] Disallow deleting of the last style
| | * \ \ \ \ Merge remote-tracking branch 'nickvergessen/ticket/10531' into ↵Andreas Fischer2011-12-161-2/+16
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prep-release-3.0.10 * nickvergessen/ticket/10531: [ticket/10531] Disallow deleting of the last style
| | | * | | | | [ticket/10531] Disallow deleting of the last styleJoas Schilling2011-12-151-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regression from PHPBB3-9675 commit 0e02f5cb0b7f615f1eadd6606a89bfd1b28f0d0d PHPBB3-9675 PHPBB3-10531
* | | | | | | | [ticket/10463] removed extra comma in malformed query in acp_styles.phpDavid King2011-12-151-1/+1
| |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | PHPBB3-10463
* | | | | | | Merge branch 'develop-olympus' into developNils Adermann2011-12-091-1/+10
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10319] Missing hidden fields in search form
| * | | | | | Merge branch 'prep-release-3.0.10' into develop-olympusNils Adermann2011-12-091-1/+10
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.10: [ticket/10319] Missing hidden fields in search form
| | * | | | | [ticket/10319] Missing hidden fields in search formVjacheslav Trushkin2011-12-091-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Missing hidden fields in search form (bug added in 3.0.9) PHPBB3-10319
| | * | | | | [prep-release-3.0.10] Bumping version number for 3.0.10-RC3.Andreas Fischer2011-12-041-1/+1
| | |/ / / /
* | | | | | 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
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 16:46:39 +0000