aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11628] Fix a bug I noticed in template->destroyNathaniel Guse2013-07-241-1/+1
| | | | | | Should not be setting $this->context = array()! PHPBB3-11628
* [ticket/11628] Remove the one usage of get_style_path()Nathaniel Guse2013-07-242-17/+3
| | | | | | Makes the code easier to follow PHPBB3-11628
* [ticket/11628] Shorten an if to an inline statementNathaniel Guse2013-07-241-9/+2
| | | | PHPBB3-11628
* [ticket/11628] Remove template_path option on set_custom_styleNathaniel Guse2013-07-242-12/+4
| | | | | | | | | This was set to default 'template/' to append template/ to all the paths, but every location was actually just setting it to '' to not append anything. So removed the option entirely (additional paths can be appended to the paths being sent to the function already) PHPBB3-11628
* [ticket/11628] Remove set_style_names function, moved to set_custom_styleNathaniel Guse2013-07-242-31/+6
| | | | PHPBB3-11628
* [ticket/11628] Set admin namespace in the constructorNathaniel Guse2013-07-241-13/+6
| | | | PHPBB3-11628
* [ticket/11628] Change set_custom_style $template path to default to stringNathaniel Guse2013-07-242-5/+5
| | | | | | | Rather than default to false and compare === false ? 'template/' : value just assign this default in the arguments PHPBB3-11628
* [ticket/11628] Remove third parameter ($names) from set_custom_styleNathaniel Guse2013-07-242-8/+6
| | | | | | | | This was basically duplicating functionality. $names would be used if not empty, else array($name) would be used. Merged functionality into the first argument PHPBB3-11628
* [ticket/11628] Return $this from set_style, set_custom_styleNathaniel Guse2013-07-242-6/+6
| | | | PHPBB3-11628
* [ticket/11628] Move setting core namespace to set_style()Nathaniel Guse2013-07-241-15/+15
| | | | PHPBB3-11628
* [ticket/11628] Remove $this->names, $this->style_names from phpbb_templateNathaniel Guse2013-07-241-16/+3
| | | | | | These are not used anywhere PHPBB3-11628
* [ticket/11628] Remove phpbb_style (move methods to phpbb_template)Nathaniel Guse2013-07-245-186/+146
| | | | PHPBB3-11628
* [ticket/11628] Remove style path providerNathaniel Guse2013-07-244-265/+1
| | | | | | No longer used since Twig was implemented. PHPBB3-11628
* [ticket/11628] Remove style resource locatorNathaniel Guse2013-07-243-555/+1
| | | | | | No longer used since Twig was implemented. PHPBB3-11628
* [ticket/11667] Use @inheritdocNathan Guse2013-07-232-14/+4
| | | | PHPBB3-11667
* Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11667Nathan Guse2013-07-233-9/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling (224) and others # Via Andreas Fischer (23) and others * 'develop' of github.com:phpbb/phpbb3: (385 commits) [ticket/11734] Readd accidently removed language strings of forum permissions [ticket/11620] Whitespace and combine function into test_case [ticket/11620] Move check_ban_test functions to setUp/tearDown for clarity [ticket/11620] Changed incorrect global variable [ticket/11620] Minor indentation changes and comment clarity [ticket/11733] Fix "Illegal offset type" Warning caused by overall feed [ticket/11733] Add browse test for feed.php [ticket/11731] Remove static calls to captcha garbage collector [ticket/11728] Replace topic_approved with topic_visibility [ticket/11620] Expected and actual test conditions wrongly swapped [ticket/11620] Space between . in directory import concatenation [ticket/11620] Changes to match merge [ticket/11620] Changes for code guidelines consistency [ticket/11620] Fix a static calls to non-static for session captcha [ticket/11620] Cleanup creation_test that was renamed on a cherry-pick [ticket/11620] Update auth_provider for new interface [ticket/11620] Added garbage_collection_test [ticket/11620] Fixed check_ban_test errors with cache and ban warning message [ticket/11620] Fixed a typo on check_ban_test [ticket/11620] Refactored check_isvalid_test to use session_test_case ...
* Merge remote-tracking branch 'EXreaction/ticket/11718' into developAndreas Fischer2013-07-231-4/+5
|\ | | | | | | | | | | | | | | | | * EXreaction/ticket/11718: [ticket/11718] Quick test for fixes in ELSEIF [ticket/11718] Twig lexer only correcting statements in IF, not ELSEIF Conflicts: tests/template/template_test.php
| * [ticket/11718] Twig lexer only correcting statements in IF, not ELSEIFNathaniel Guse2013-07-191-4/+5
| | | | | | | | PHPBB3-11718
* | Merge remote-tracking branch 'nickvergessen/ticket/11733' into developAndreas Fischer2013-07-231-1/+1
|\ \ | | | | | | | | | | | | | | | * nickvergessen/ticket/11733: [ticket/11733] Fix "Illegal offset type" Warning caused by overall feed [ticket/11733] Add browse test for feed.php
| * | [ticket/11733] Fix "Illegal offset type" Warning caused by overall feedJoas Schilling2013-07-231-1/+1
| | | | | | | | | | | | PHPBB3-11733
* | | Merge remote-tracking branch 'asperous/ticket/11731' into developAndreas Fischer2013-07-231-1/+2
|\ \ \ | | | | | | | | | | | | | | | | * asperous/ticket/11731: [ticket/11731] Remove static calls to captcha garbage collector
| * | | [ticket/11731] Remove static calls to captcha garbage collectorAndy Chase2013-07-221-1/+2
| | | | | | | | | | | | | | | | PHPBB3-11731
* | | | [ticket/11728] Replace topic_approved with topic_visibilityJoas Schilling2013-07-221-1/+1
| |/ / |/| | | | | | | | PHPBB3-11728
* | | Merge pull request #1589 from marc1706/ticket/11717Nathan Guse2013-07-221-1/+1
|\ \ \ | |/ / |/| | [ticket/11717] Use topic_posts_approved instead of topic_replies
| * | [ticket/11717] Use topic_posts_approved instead of topic_repliesMarc Alexander2013-07-201-1/+1
| |/ | | | | | | | | | | | | Due to the move to soft-delete, the topic_replies column no longer exists in the topics table. Instead, the column topic_posts_approved should be used. PHPBB3-11717
* | Merge pull request #1513 from nickvergessen/ticket/11582Nathan Guse2013-07-221-0/+340
|\ \ | | | | | | Ticket/11582 Split permission logic from translations
| * | [ticket/11582] Test the event and and fix it.Joas Schilling2013-07-141-1/+1
| | | | | | | | | | | | PHPBB3-11582
| * | [ticket/11582] Move file to new directoryJoas Schilling2013-07-141-0/+340
| | | | | | | | | | | | PHPBB3-11582
* | | [ticket/11707] Twig DEFINE not working as expectedNathaniel Guse2013-07-191-4/+8
| |/ |/| | | | | PHPBB3-11707
* | [ticket/11706] Use @ to suppress errors for getimagesize in remote avatarMarc Alexander2013-07-141-1/+1
| | | | | | | | PHPBB3-11706
* | Merge remote-tracking branch 'galaxyAbstractor/ticket/11697' into developAndreas Fischer2013-07-141-1/+1
|/ | | | | * galaxyAbstractor/ticket/11697: [ticket/11697] author_search() used incorrect parameter
* [ticket/11696] Move file to new directoryJoas Schilling2013-07-141-0/+2486
| | | | PHPBB3-11696
* [ticket/11696] Rename db_tools.php so it can be autoloadedJoas Schilling2013-07-141-5/+0
| | | | PHPBB3-11696
* [ticket/11698] Moving all autoloadable files to phpbb/Nils Adermann2013-07-14246-0/+46786
PHPBB3-11698