aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developNils Adermann2011-08-184-6/+9
|\ | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/8571] Show age as 0 in birthday list when birthday is in the future. [ticket/8571] Show 'Age: 0' on viewprofile when birthday is in the future. [ticket/8571] Also display age on memberlist/viewprofile when age is 0. Conflicts: phpBB/index.php
| * Merge remote-tracking branch 'github-bantu/ticket/8571' into develop-olympusNils Adermann2011-08-184-5/+5
| |\ | | | | | | | | | | | | | | | | | | * github-bantu/ticket/8571: [ticket/8571] Show age as 0 in birthday list when birthday is in the future. [ticket/8571] Show 'Age: 0' on viewprofile when birthday is in the future. [ticket/8571] Also display age on memberlist/viewprofile when age is 0.
| | * [ticket/8571] Show age as 0 in birthday list when birthday is in the future.Andreas Fischer2011-07-201-1/+1
| | | | | | | | | | | | PHPBB3-8571
| | * [ticket/8571] Show 'Age: 0' on viewprofile when birthday is in the future.Andreas Fischer2011-07-201-1/+1
| | | | | | | | | | | | PHPBB3-8571
| | * [ticket/8571] Also display age on memberlist/viewprofile when age is 0.Andreas Fischer2011-07-202-3/+3
| | | | | | | | | | | | PHPBB3-8571
* | | Merge remote-tracking branch 'erikfrerejean/ticket/10312' into developAndreas Fischer2011-08-162-2/+2
|\ \ \ | | | | | | | | | | | | | | | | * erikfrerejean/ticket/10312: [ticket/10312] Un-check the shadow option while moving.
| * | | [ticket/10312] Un-check the shadow option while moving.Erik Frèrejean2011-08-102-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't create a shadow topic by default when moving a topic the user should have the option to do this but it shouldn't be done by default. PHPBB3-10312
* | | | Merge remote-tracking branch 'erikfrerejean/ticket/10316' into developAndreas Fischer2011-08-161-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * erikfrerejean/ticket/10316: [ticket/10316] Resolve inconsistent move topic behavior
| * | | | [ticket/10316] Resolve inconsistent move topic behaviorErik Frèrejean2011-08-151-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When moving a topic you can straight away lock it, when using proSilver this checkbox is unchecked by default. subSilver2 however has this checked. Change subSilver2 to not check the box by default and behave as proSilver does. PHPBB3-10316
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-08-161-3/+11
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * develop-olympus: [ticket/9976] Fix link to post when two posts have the same post_time.
| * | | Merge remote-tracking branch 'p/ticket/9976' into develop-olympusAndreas Fischer2011-08-161-3/+11
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * p/ticket/9976: [ticket/9976] Fix link to post when two posts have the same post_time.
| | * | | [ticket/9976] Fix link to post when two posts have the same post_time.Joas Schilling2011-07-301-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When two posts have the same post_time, a link to the first post being on page 1, leads you to the second post with the same timestamp on page two. So in case the post_times are equal, we need to use the post_id to correctly order the posts. PHPBB3-9976
* | | | | Merge remote-tracking branch 'igorw/ticket/9608' into developOleg Pudeyev2011-08-1412-23/+22
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * igorw/ticket/9608: [ticket/9608] Remove use of references in topic_review [ticket/9608] Revert changes to normalizer [ticket/9608] Remove blank line [ticket/9608] Remove use of references in captcha and other places
| * | | | | [ticket/9608] Remove use of references in topic_reviewIgor Wiedler2011-08-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9608
| * | | | | [ticket/9608] Revert changes to normalizerIgor Wiedler2011-08-081-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They were breaking the tests. PHPBB3-9608
| * | | | | [ticket/9608] Remove blank lineIgor Wiedler2011-07-171-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9608
| * | | | | [ticket/9608] Remove use of references in captcha and other placesIgor Wiedler2011-07-1312-27/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | References are not really needed in PHP due to copy-on-write. Since PHP5, objects are always passed around as identifiers, which means they are mutable. So it is no longer required to pass these by reference either. PHPBB3-9608
* | | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-08-141-11/+44
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9297] Add network to class name of unit tests. [ticket/9297] Fix typo in localhost. [ticket/9297] Rename test class to reflect its contents. [ticket/9297] Adjust comment - IPv6 is needed for IPv6 connections to work. [ticket/9297] Fix markTestSkipped call in setUpBeforeClass. [ticket/9297] Skip FTP PASV/EPSV test if FTP connection fails. [ticket/9297] Separate ipv4 and ipv6 tests into separate functions. [ticket/9297] Update copyright year of unit test file. [ticket/9297] Make EPSV unit tests work without IPv6. [ticket/9297] Unit tests for ftp_fsock PASV and EPSV. [ticket/9297] Add support for Extended Passive Mode (EPSV) in ftp_fsock class.
| * | | | | Merge remote-tracking branch 'bantu/ticket/9297' into develop-olympusOleg Pudeyev2011-08-141-11/+44
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/9297: [ticket/9297] Add network to class name of unit tests. [ticket/9297] Fix typo in localhost. [ticket/9297] Rename test class to reflect its contents. [ticket/9297] Adjust comment - IPv6 is needed for IPv6 connections to work. [ticket/9297] Fix markTestSkipped call in setUpBeforeClass. [ticket/9297] Skip FTP PASV/EPSV test if FTP connection fails. [ticket/9297] Separate ipv4 and ipv6 tests into separate functions. [ticket/9297] Update copyright year of unit test file. [ticket/9297] Make EPSV unit tests work without IPv6. [ticket/9297] Unit tests for ftp_fsock PASV and EPSV. [ticket/9297] Add support for Extended Passive Mode (EPSV) in ftp_fsock class.
| | * | | | | [ticket/9297] Add support for Extended Passive Mode (EPSV) in ftp_fsock class.Andreas Fischer2011-08-111-11/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9297
* | | | | | | Merge remote-tracking branch 'github-p/feature/template-engine' into developNils Adermann2011-08-1318-1531/+2286
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-p/feature/template-engine: (87 commits) [feature/template-engine] Delete _get_locator function. [feature/template-engine] Clean up template locator usage in bbcode. [feature/template-engine] Need to call set_template on template. [feature/template-engine] Update installer for template engine changes. [feature/template-engine] Dependency inject locator into template. [feature/template-engine] Delete useless code from set_template. [feature/template-engine] Delete no longer used $template_filename property. [feature/template-engine] Delete useless $template globalization. [feature/template-engine] Use template engine class in bbcode class. [feature/template-engine] Corrected an error message in template locator. [feature/template-engine] Remaining documentation. [feature/template-engine] More documentation for template class. [feature/template-engine] Create load_and_render to reduce code duplication. [feature/template-engine] Get rid of orig_tpl_* in template engine. [feature/template-engine] Delete $style_name param from locator's set_custom_template. [feature/template-engine] Add constructor to template locator. [feature/template-engine] Factor template locator out of template class. [feature/template-engine] Delete $files_template property. [feature/template-engine] Rename is_absolute to phpbb_is_absolute. [feature/template-engine] Test template DEFINE statements across files ... Conflicts: .gitignore phpBB/includes/template.php
| * | | | | | [feature/template-engine] Delete _get_locator function.Oleg Pudeyev2011-08-131-13/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is no longer needed as locator is injected into template. PHPBB3-9726
| * | | | | | [feature/template-engine] Clean up template locator usage in bbcode.Oleg Pudeyev2011-08-131-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9726
| * | | | | | [feature/template-engine] Need to call set_template on template.Oleg Pudeyev2011-08-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9726
| * | | | | | [feature/template-engine] Update installer for template engine changes.Oleg Pudeyev2011-08-091-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9726
| * | | | | | [feature/template-engine] Dependency inject locator into template.Oleg Pudeyev2011-08-094-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9726
| * | | | | | [feature/template-engine] Delete useless code from set_template.Oleg Pudeyev2011-08-091-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | set_custom_template performs these calls, repeating them in set_template is not needed. PHPBB3-9726
| * | | | | | [feature/template-engine] Delete no longer used $template_filename property.Oleg Pudeyev2011-08-091-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9726
| * | | | | | [feature/template-engine] Delete useless $template globalization.Oleg Pudeyev2011-08-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9726
| * | | | | | [feature/template-engine] Use template engine class in bbcode class.Oleg Pudeyev2011-08-072-17/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9726
| * | | | | | [feature/template-engine] Corrected an error message in template locator.Oleg Pudeyev2011-08-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9726
| * | | | | | [feature/template-engine] Remaining documentation.Oleg Pudeyev2011-08-077-1/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9726
| * | | | | | [feature/template-engine] More documentation for template class.Oleg Pudeyev2011-08-071-8/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9726
| * | | | | | [feature/template-engine] Create load_and_render to reduce code duplication.Oleg Pudeyev2011-08-071-7/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9726
| * | | | | | [feature/template-engine] Get rid of orig_tpl_* in template engine.Oleg Pudeyev2011-08-042-68/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The origins of orig_tpl_* are not pretty. Please see the following commits and associated tickets: r9823, r9839, r9847, r10150, r10460. In short, multiple hacks were required due to template engine reading inheritance/storedb flags from $user (global) even when the template that was being looked up or rendered was not the "active style of the current user". We no longer store templates in the database, removing half of the problem. This commit fixes the second half of the problem by deleting set_template_path function from template locator, and moving that logic back into the template class' set_template. set_template now calls set_custom_template, the latter only taking the template path and the fallback paths as parameters. With this change template locator no longer uses $user and does not use phpbb root path either. All logic involving setting the user's "active" template is now encapsulated in a single template class's function, set_template. Setting other templates is done via set_custom_template and the caller is responsible for determining and passing in fallback/inheritance path, if any. PHPBB3-9726
| * | | | | | [feature/template-engine] Delete $style_name param from locator's ↵Oleg Pudeyev2011-08-042-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | set_custom_template. This parameter was unused, it was only used by template's set_custom_template to determine cache file prefix. PHPBB3-9726
| * | | | | | [feature/template-engine] Add constructor to template locator.Oleg Pudeyev2011-08-042-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9726
| * | | | | | [feature/template-engine] Factor template locator out of template class.Oleg Pudeyev2011-07-302-118/+283
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Template locator is responsible for maintaining mapping from template handles to filenames and paths, and provides resolution services using these mappings. Template locator is aware of template inheritance and is capable of checking template file existence on the filesystem. PHPBB3-9726
| * | | | | | [feature/template-engine] Delete $files_template property.Oleg Pudeyev2011-07-301-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This seems to have been used for db storage of templates. We no longer offer db storage of templates, and thus currenty $files_template is only written to but not read anywhere. PHPBB3-9726
| * | | | | | [feature/template-engine] Rename is_absolute to phpbb_is_absolute.Oleg Pudeyev2011-07-242-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9726
| * | | | | | [feature/template-engine] Docblocks, no more constructor for filterIgor Wiedler2011-07-161-6/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add docblocks for phpbb_template_filter, remove the useless constructor. PHPBB3-9726
| * | | | | | [feature/template-engine] Add ampersands to return refs by reference.Oleg Pudeyev2011-07-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9726
| * | | | | | [feature/template-engine] Delete useless assignment by reference for $lang.Oleg Pudeyev2011-07-102-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9726
| * | | | | | [feature/template-engine] Remove $include_once argument of display()Igor Wiedler2011-07-102-11/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9726
| * | | | | | [feature/template-engine] Refactor $config dependency out of the filterIgor Wiedler2011-07-103-10/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The template stream filter no longer depends on the $config global. Instead it uses a 'allow_php' param that is passed via stream_bucket_append's last argument. Tests also adjusted. PHPBB3-9726
| * | | | | | [feature/template-engine] Fix some commentsIgor Wiedler2011-07-102-15/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9726
| * | | | | | [feature/template-engine] Move template.php to includes/templateIgor Wiedler2011-07-104-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows making use of autoloading. PHPBB3-9726
| * | | | | | [feature/template-engine] Fixed absolute path PHP includes, added test.Oleg Pudeyev2011-05-191-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9726
| * | | | | | [feature/template-engine] Delete @version everywhere.Oleg Pudeyev2011-05-147-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is not used since the switch to git. PHPBB3-9726
| * | | | | | [feature/template-engine] Moved phpbb_template_filter into own file.Oleg Pudeyev2011-05-142-831/+848
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9726
generated by cgit v1.2.1 (git 2.21.0) at 2026-02-07 19:22:42 +0000