aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/10758] Extract obtain_user_data for the benefit of tests.Oleg Pudeyev2012-12-192-6/+21
| | | | PHPBB3-10758
* [ticket/10758] Spelling fix.Oleg Pudeyev2012-12-151-1/+1
| | | | PHPBB3-10758
* [ticket/10758] Dependency inject parameters into update_foes.Oleg Pudeyev2012-12-153-8/+12
| | | | | | Also add phpbb prefix since the signature is being changed anyway. PHPBB3-10758
* [ticket/10758] Dependency inject parameters into cache_moderators.Oleg Pudeyev2012-12-156-32/+38
| | | | | | Also add phpbb prefix since the signature is being changed anyway. PHPBB3-10758
* Merge remote-tracking branch 'remotes/Oleg/ticket/11162' into developNathan Guse2012-12-151-4/+4
|\ | | | | | | | | | | | | # By Oleg Pudeyev # Via Oleg Pudeyev * remotes/Oleg/ticket/11162: [ticket/11162] Chase dbal autoloading changes in develop.
| * [ticket/11162] Chase dbal autoloading changes in develop.Oleg Pudeyev2012-12-131-4/+4
| | | | | | | | PHPBB3-11162
* | [ticket/11250] Move quote special cases from class to unit testsJoas Schilling2012-12-141-11/+0
|/ | | | PHPBB3-11250
* Merge branch 'develop-olympus' into developAndreas Fischer2012-12-143-13/+217
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: (22 commits) [ticket/11162] Reformat. [ticket/11162] Rename tricky updates to database helper. [ticket/11162] Use empty($queries). [ticket/11162] Review comments fixed. [ticket/11162] Reformat. [ticket/11162] Newlines to LF. [ticket/11162] Use correct functions. [ticket/11162] Account for notify_status. [ticket/11162] This test really only works for bookmarks. [ticket/11162] The test is not at all trivial. [ticket/11162] Add includes. [ticket/11162] Move to a separate file to avoid blowing out functions.php. [ticket/11162] No whitespace changes in olympus. [ticket/11162] Fix inaccurately copy pasted comment. [ticket/11162] Use phpbb_update_rows_avoiding_duplicates in mcp. [ticket/11162] Clarify that only the two tables actually work. [ticket/11162] Uncomment transactions. [ticket/11162] An implementation that actually works. [ticket/11162] Make count function upper case. [ticket/11162] Rename count variable name to remaining_rows. ...
| * Merge remote-tracking branch 'p/ticket/11162' into develop-olympusAndreas Fischer2012-12-143-13/+217
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/11162: (22 commits) [ticket/11162] Reformat. [ticket/11162] Rename tricky updates to database helper. [ticket/11162] Use empty($queries). [ticket/11162] Review comments fixed. [ticket/11162] Reformat. [ticket/11162] Newlines to LF. [ticket/11162] Use correct functions. [ticket/11162] Account for notify_status. [ticket/11162] This test really only works for bookmarks. [ticket/11162] The test is not at all trivial. [ticket/11162] Add includes. [ticket/11162] Move to a separate file to avoid blowing out functions.php. [ticket/11162] No whitespace changes in olympus. [ticket/11162] Fix inaccurately copy pasted comment. [ticket/11162] Use phpbb_update_rows_avoiding_duplicates in mcp. [ticket/11162] Clarify that only the two tables actually work. [ticket/11162] Uncomment transactions. [ticket/11162] An implementation that actually works. [ticket/11162] Make count function upper case. [ticket/11162] Rename count variable name to remaining_rows. ...
| | * [ticket/11162] Rename tricky updates to database helper.Oleg Pudeyev2012-12-123-2/+2
| | | | | | | | | | | | PHPBB3-11162
| | * [ticket/11162] Use empty($queries).Oleg Pudeyev2012-12-051-6/+2
| | | | | | | | | | | | PHPBB3-11162
| | * [ticket/11162] Review comments fixed.Oleg Pudeyev2012-12-051-6/+6
| | | | | | | | | | | | PHPBB3-11162
| | * [ticket/11162] Reformat.Oleg Pudeyev2012-12-051-3/+5
| | | | | | | | | | | | PHPBB3-11162
| | * [ticket/11162] Newlines to LF.Oleg Pudeyev2012-12-051-208/+208
| | | | | | | | | | | | PHPBB3-11162
| | * [ticket/11162] Use correct functions.Oleg Pudeyev2012-12-052-4/+4
| | | | | | | | | | | | PHPBB3-11162
| | * [ticket/11162] Account for notify_status.Oleg Pudeyev2012-12-051-3/+108
| | | | | | | | | | | | PHPBB3-11162
| | * [ticket/11162] Add includes.Oleg Pudeyev2012-12-042-0/+8
| | | | | | | | | | | | PHPBB3-11162
| | * [ticket/11162] Move to a separate file to avoid blowing out functions.php.Oleg Pudeyev2012-12-042-87/+103
| | | | | | | | | | | | PHPBB3-11162
| | * [ticket/11162] No whitespace changes in olympus.Oleg Pudeyev2012-12-011-1/+1
| | | | | | | | | | | | PHPBB3-11162
| | * [ticket/11162] Fix inaccurately copy pasted comment.Oleg Pudeyev2012-12-011-1/+1
| | | | | | | | | | | | PHPBB3-11162
| | * [ticket/11162] Use phpbb_update_rows_avoiding_duplicates in mcp.Oleg Pudeyev2012-12-012-12/+2
| | | | | | | | | | | | PHPBB3-11162
| | * [ticket/11162] Clarify that only the two tables actually work.Oleg Pudeyev2012-12-011-0/+2
| | | | | | | | | | | | PHPBB3-11162
| | * [ticket/11162] Uncomment transactions.Oleg Pudeyev2012-12-011-2/+2
| | | | | | | | | | | | PHPBB3-11162
| | * [ticket/11162] An implementation that actually works.Oleg Pudeyev2012-12-011-5/+68
| | | | | | | | | | | | PHPBB3-11162
| | * [ticket/11162] Extract existing behavior into a function and add a test.Oleg Pudeyev2012-11-021-1/+23
| | | | | | | | | | | | PHPBB3-11162
* | | [ticket/11015] Move comment in the right place.Oleg Pudeyev2012-12-131-7/+7
| | | | | | | | | | | | PHPBB3-11015
* | | [ticket/11015] Correctly transform 'mysqli' etc. in phpbb_convert_30_dbms_to_31Andreas Fischer2012-12-131-0/+9
| | | | | | | | | | | | PHPBB3-11015
* | | [ticket/11015] Fix 3.0 to 3.1 dbms conversion for mysqli.Oleg Pudeyev2012-12-131-5/+21
| | | | | | | | | | | | PHPBB3-11015
* | | [ticket/11015] Change more docblocks to phpbb_db_driver.Oleg Pudeyev2012-12-134-5/+5
| | | | | | | | | | | | PHPBB3-11015
* | | Merge remote-tracking branch 'upstream/develop' into ticket/11015Oleg Pudeyev2012-12-131-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: [ticket/11262] Add .lock in cache directory to .gitignore [ticket/11265] Add assertions for board installation success. [ticket/11263] Fix PHP Notice: Undefined variable: extension_manager [ticket/10975] Add a test for viewing a profile. [ticket/10975] Test restricting by first character. [ticket/10975] Avoid rewriting global config twice. [ticket/10975] Test memberlist, not user creation. [ticket/10975] Some quick tests to check the memberlist behaviour
| * | | [ticket/11263] Fix PHP Notice: Undefined variable: extension_managerNathan Guse2012-12-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | $extension_manager should be $phpbb_extension_manager PHPBB3-11263
* | | | Merge remote-tracking branch 'upstream/develop' into ticket/11015Oleg Pudeyev2012-12-1320-101/+571
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: (101 commits) [ticket/10491] Make recreate_database static. [ticket/11088] Pass required objects in as arguments [ticket/11088] Globalize objects in new permission function [ticket/11088] Move permission creation to a function [ticket/11088] Copy a_styles permission for a_extensions [ticket/11088] Remove extraneous word from sentence in comment [ticket/11088] Changed "file extensions" to "attachment extensions" [ticket/11088] Fix the database updater to correctly manipulate the modules [ticket/11088] Put language pack module move below extension module creation [ticket/11088] Untested, progress on update script [ticket/11088] Fix typo (period instead of comma) [ticket/11088] Untested progress for update script [ticket/11088] Added missing comma [ticket/11088] Removed added space [ticket/11088] Move style, extension and language pack management to customise [ticket/11243] Show download all link on all pages of topic with attachments [feature/template-events] Pass arguments in correct order. [feature/template-events] Pass arguments in correct order. [ticket/10491] Install board once per test run. [ticket/11257] Do not require set_name() method to exist ...
| * | | [ticket/11088] Move style, extension and language pack management to customiseDavid King2012-12-122-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of being separated, these related ACP modules are now grouped intuitively. PHPBB3-11088
| * | | Merge remote-tracking branch 'p/feature/template-events' into developDavid King2012-12-101-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/feature/template-events: [feature/template-events] Pass arguments in correct order. Conflicts: phpBB/includes/style/style.php
| | * | | [feature/template-events] Pass arguments in correct order.Oleg Pudeyev2012-12-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thank you imkingdavid. PHPBB3-9550
| * | | | Merge remote-tracking branch 'p/feature/template-events' into developDavid King2012-12-107-19/+209
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Oleg Pudeyev (36) and others # Via Oleg Pudeyev * p/feature/template-events: (47 commits) [feature/template-events] Pass arguments in correct order. [feature/template-events] Order extensions in mock extension manager. [feature/template-events] Changes per imkingdavid's review. [feature/template-events] Make style names private on template. [feature/template-events] Test for event that is defined in parent style only. [feature/template-events] Specify style names, add inheritance tests. [feature/template-events] Normalize expected directory trees. [feature/template-events] Allow dataset to be correctly selectable. [feature/template-events] Dataset for template event testing with inheritance. [feature/template-events] Use style names array in template filter. [feature/template-events] Generate style names array in set_style. [feature/template-events] Convert a single style name to array of them. [feature/template-events] Chase dependency injection for template context. [feature/template-events] Adjust template events test to use the dataset. [feature/template-events] Create a dataset for template event tests. [feature/template-events] Indentation fix. [feature/template-events] Cosmetic changes. [feature/template-events] Wording: wrongly -> improperly. [feature/template-events] Indentation fix. [feature/template-events] Rename template_name to style_name. ...
| | * | | | [feature/template-events] Pass arguments in correct order.Oleg Pudeyev2012-12-101-1/+1
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Thank you imkingdavid. PHPBB3-9550
| | * | | [feature/template-events] Changes per imkingdavid's review.Oleg Pudeyev2012-11-174-5/+16
| | | | | | | | | | | | | | | | | | | | PHPBB3-9550
| | * | | [feature/template-events] Make style names private on template.Oleg Pudeyev2012-11-172-2/+14
| | | | | | | | | | | | | | | | | | | | PHPBB3-9550
| | * | | [feature/template-events] Use style names array in template filter.Oleg Pudeyev2012-11-171-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This provides a straightforward way of iterating over all styles looking for templates in extensions. PHPBB3-9550
| | * | | [feature/template-events] Generate style names array in set_style.Oleg Pudeyev2012-11-171-5/+11
| | | | | | | | | | | | | | | | | | | | PHPBB3-9550
| | * | | [feature/template-events] Convert a single style name to array of them.Oleg Pudeyev2012-11-175-18/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows template code to know the entire style hierarchy for templates being rendered. PHPBB3-9550
| | * | | [feature/template-events] Indentation fix.Nathan Guse2012-11-171-3/+6
| | | | | | | | | | | | | | | | | | | | PHPBB3-9550
| | * | | [feature/template-events] Cosmetic changes.Oleg Pudeyev2012-11-172-4/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-9550
| | * | | [feature/template-events] Wording: wrongly -> improperly.Nathan Guse2012-11-171-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-9550
| | * | | [feature/template-events] Indentation fix.Nathan Guse2012-11-171-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-9550
| | * | | [feature/template-events] Rename template_name to style_name.Oleg Pudeyev2012-11-173-17/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Style name" makes a lot more sense and should be in line with recent style/template changes. PHPBB3-9550
| | * | | [feature/template-events] Report when templates cannot be compiled.Oleg Pudeyev2012-11-171-0/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-9550
| | * | | [feature/template-events] Update EVENT tag documentation.Oleg Pudeyev2012-11-171-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It should now fairly closely reflect what actually happens. PHPBB3-9550
| | * | | [feature/template-events] Delete old comments/test code.Oleg Pudeyev2012-11-171-7/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-9550