aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | [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
* | | Merge PR #1152 branch 'nickvergessen/ticket/11278' into develop-olympusOleg Pudeyev2012-12-221-17/+30
|\ \ \ | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/11278: [ticket/11278] Comment out the code for dropping the Q&A tables [ticket/11278] Fix not running queries from db tools in database update
| * | | [ticket/11278] Comment out the code for dropping the Q&A tablesJoas Schilling2012-12-211-6/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to a bug, vanilla phpbb could not create captcha tables in 3.0.8 on firebird. It was possible for board administrators to adjust the code to work. If code was manually adjusted by board administrators, index names would not be the same as what 3.0.9 and newer expect. This code fragment drops captcha tables, destroying all entered Q&A captcha configuration, such that when Q&A is configured next the respective tables will be created with corrent index names. If you wish to preserve your Q&A captcha configuration, you can manually rename indexes to the currently expected name: phpbb_captcha_questions_lang_iso => phpbb_captcha_question_lang phpbb_captcha_answers_question_id => phpbb_captcha_answers_qid Again, this needs to be done only if a board was manually modified to fix broken captcha code. PHPBB3-11278
| * | | [ticket/11278] Fix not running queries from db tools in database updateJoas Schilling2012-12-191-13/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The db_tools class is running in return mode, which means that the queries are not run, but just returned. Therefor the broken tables were not removed from the database. PHPBB3-11278
* | | | [ticket/10880] The m_approve permisson no longer implies f_noapprove.Andreas Fischer2012-12-192-5/+7
|/ / / | | | | | | | | | 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] Revert more whitespace changes.Oleg Pudeyev2012-12-051-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-10841
* | | | | [ticket/10841] Revert whitespace changes.Oleg Pudeyev2012-12-052-20/+20
| | | | | | | | | | | | | | | | | | | | PHPBB3-10841
* | | | | [ticket/10841] adding space after ifSenky2012-12-051-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-10841
* | | | | [ticket/10841] removing unnecessary spacingSenky2012-12-051-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-10841
* | | | | [ticket/10841] changing affectedrows check to COUNT in sqlSenky2012-12-051-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this sould reduce load and be faster. Also freeresult functions added PHPBB3-10841
* | | | | [ticket/10841] Modifying style and language selectors in UCPSenky2012-12-053-28/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit also deletes all unnecessary blank spaces at the end of the lines in both ucp_prefs_personal.html PHPBB3-10841
* | | | | [ticket/10602] Avoid a race condition.Oleg Pudeyev2012-12-051-2/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-10602
* | | | | [ticket/10602] Use last_queue_run for its intended purpose.Oleg Pudeyev2012-12-051-3/+8
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We keep the last queue run time around, therefore for determining whether enough time has passed since the last run we can simply use this config variable. When there is no queue file we consider a queue run successful. Previously queue.php ("cache file") modification time would be used for determining whether enough time has passed since last queue run. The problem was that modification time would be updated whenever anything was added to the queue, creating a situation where if queue is processed less frequently than it is added to that email would not be sent. PHPBB3-10602
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-15 15:08:50 +0000