aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11196] Changed 401 response message in session.php.erangamapa2013-02-121-1/+1
| | | | | | | In session.php 401 response message was "Not Authorized". I changed it to "Unauthorized". PHPBB3-11196
* [ticket/11233] prohibit selecting anonymous user as a PM recipientDhruv2013-01-301-1/+1
| | | | | | | While composing pm, it should not be allowed to add anonymous user as a PM recipient PHPBB3-11233
* [ticket/11343] Remove spare parentheses.Andreas Fischer2013-01-251-1/+1
| | | | PHPBB3-11343
* [ticket/11343] Remove spare space.Andreas Fischer2013-01-251-1/+1
| | | | PHPBB3-11343
* [ticket/11343] Use === when checking stored user_actkey against user input.Andreas Fischer2013-01-251-1/+1
| | | | | | | Use strict comparison when checking whether stored user_actkey is equal to user input. PHPBB3-11343
* Merge remote-tracking branch 'remotes/Sajaki/ticket/10854' into develop-olympusNathan Guse2013-01-151-0/+16
|\ | | | | | | | | | | | | # By Sajaki # Via Sajaki * remotes/Sajaki/ticket/10854: [ticket/10854] sql server drop default constraint when dropping column
| * [ticket/10854] sql server drop default constraint when dropping columnSajaki2012-04-281-0/+16
| | | | | | | | | | | | drops default columns with T-SQL before attempting drop column to avoids sql exception. This is a huge annoyance in UMIL scripts running under sql server.
* | [ticket/11301] Guidelines: Add spaces in front and after the / operator.Andreas Fischer2013-01-081-1/+1
| | | | | | | | PHPBB3-11301
* | [ticket/11301] Explicitly cast str offset to int to prevent E_NOTICE on 5.4.Andreas Fischer2013-01-081-1/+1
| | | | | | | | PHPBB3-11301
* | Merge remote-tracking branch 'gn36/ticket/11292' into develop-olympusAndreas Fischer2013-01-061-0/+1
|\ \ | | | | | | | | | | | | * gn36/ticket/11292: [ticket/11292] Fix: Newlines removed in display of PM reports
| * | [ticket/11292] Fix: Newlines removed in display of PM reportsMartin Beckmann2012-12-241-0/+1
| | | | | | | | | | | | | | | | | | | | | Report text is run through make_clickable and bbcode_nl2br for PMs just as it is for posts. PHPBB3-11292
* | | [ticket/11293] Add a note that mysqli should be in front of mysql.Oleg Pudeyev2012-12-251-0/+2
|/ / | | | | | | | | | | | | php 5.5 alpha 2 deprecated mysql extension, prefer mysqli if both are available. PHPBB3-11293
* | [ticket/10880] The m_approve permisson no longer implies f_noapprove.Andreas Fischer2012-12-191-2/+3
| | | | | | | | PHPBB3-10880
* | [ticket/8610] Update commentNathan Guse2012-12-151-1/+1
| | | | | | | | PHPBB3-8610
* | Merge branch 'develop-olympus' of github.com:phpbb/phpbb3 into ticket/8610Nathan Guse2012-12-133-16/+218
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Oleg Pudeyev (29) and others # Via Andreas Fischer (3) and others * 'develop-olympus' of github.com:phpbb/phpbb3: (36 commits) [ticket/11262] Add .lock in cache directory to .gitignore [ticket/11265] Add assertions for board installation success. [ticket/11162] Reformat. [ticket/10491] Make recreate_database static. [ticket/11162] Rename tricky updates to database helper. [ticket/10491] Install board once per test run. [ticket/10972] Drop user deletion. [ticket/10972] Tweak user addition. [ticket/10972] Add destroy method to mock cache. [ticket/10972] Add mock null cache. [ticket/10972] Backport get_db from develop. [ticket/10972] Added explicit checks for creating duplicate users. [ticket/10972] Moved tests into appropriate places and added comments [ticket/10972] Added methods for creating and deleting basic users [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. ... Conflicts: phpBB/includes/mcp/mcp_topic.php
| * \ 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/8610] Use phpbb_update_rows_avoiding_duplicatesNathan Guse2012-12-132-22/+6
| | | | | | | | | | | | | | | | PHPBB3-8610
* | | | [ticket/8610] Revert some funky merging I did from rebaseNathan Guse2012-12-133-12/+3
| | | | | | | | | | | | | | | | PHPBB3-8610
* | | | [ticket/8610] Add some commentsNathan Guse2012-12-132-0/+4
| | | | | | | | | | | | | | | | PHPBB3-8610
* | | | [ticket/8610] Update Bookmarks and Subscriptions when splitting topicsNathaniel Guse2012-12-132-4/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Update bookmarks and subscriptions to add bookmarks/subscriptions to the new topic when using the split_topic function PHPBB3-8610
* | | | [ticket/8610] Update Bookmarks when merging posts into another topicNathaniel Guse2012-12-131-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Update bookmarks to the new topic when merging posts into another topic using the merge_posts function. PHPBB3-8610
* | | | [ticket/8610] Update Bookmarks when forking topicsNathaniel Guse2012-12-131-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Update bookmarks to the new topic when forking topics using the mcp_fork_topic function. PHPBB3-8610
* | | | [ticket/8610] Update Bookmarks when merging topicsNathaniel Guse2012-12-131-1/+9
|/ / / | | | | | | | | | | | | | | | | | | Update bookmarks to the new topic when merging multiple topics using the merge_topics function. PHPBB3-8610
* | | Merge remote-tracking branch 'p/ticket/10205' into develop-olympusAndreas Fischer2012-12-087-76/+253
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/10205: [ticket/10205] Reduce nesting in mysql drivers. [ticket/10205] Rewrite _sql_error implementations to have a single return. [ticket/10205] Cosmetic changes. [ticket/10205] Add some columns to the empty fixture file for mssqlnative. [ticket/10205] Delete stray return. [ticket/10205] Test failed connection attempts. [ticket/10205] Check for function existence in mssql connect method. [ticket/10205] Convert mssqlnative driver to the same logic. [ticket/10205] Fix a parse error in oracle driver. [ticket/10205] Fix remaining db drivers. [ticket/10205] Avoid calling mysqli functions when mysqli is missing. [ticket/10205] Account for potentially missing extensions in dbal.
| * | | [ticket/10205] Reduce nesting in mysql drivers.Oleg Pudeyev2012-12-042-28/+22
| | | | | | | | | | | | | | | | PHPBB3-10205
| * | | [ticket/10205] Rewrite _sql_error implementations to have a single return.Oleg Pudeyev2012-12-045-20/+34
| | | | | | | | | | | | | | | | PHPBB3-10205
| * | | [ticket/10205] Cosmetic changes.Oleg Pudeyev2012-12-045-8/+8
| | | | | | | | | | | | | | | | PHPBB3-10205
| * | | [ticket/10205] Check for function existence in mssql connect method.Oleg Pudeyev2012-12-041-0/+8
| | | | | | | | | | | | | | | | PHPBB3-10205
| * | | [ticket/10205] Convert mssqlnative driver to the same logic.Oleg Pudeyev2012-12-041-20/+32
| | | | | | | | | | | | | | | | PHPBB3-10205
| * | | [ticket/10205] Fix a parse error in oracle driver.Oleg Pudeyev2012-12-041-1/+1
| | | | | | | | | | | | | | | | PHPBB3-10205
| * | | [ticket/10205] Fix remaining db drivers.Oleg Pudeyev2012-12-045-43/+93
| | | | | | | | | | | | | | | | PHPBB3-10205
| * | | [ticket/10205] Avoid calling mysqli functions when mysqli is missing.Oleg Pudeyev2012-12-041-4/+14
| | | | | | | | | | | | | | | | PHPBB3-10205
| * | | [ticket/10205] Account for potentially missing extensions in dbal.Oleg Pudeyev2012-12-045-4/+93
| | | | | | | | | | | | | | | | PHPBB3-10205
* | | | [ticket/10841] adding space after ifSenky2012-12-051-2/+2
| | | | | | | | | | | | | | | | PHPBB3-10841