aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* [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
* | [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-051-0/+30
| | | | | | | | | | | | | | 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
* [ticket/11227] @return void -> @return null in develop-olympus.Oleg Pudeyev2012-11-299-13/+13
| | | | PHPBB3-11227
* [ticket/11192] Update $value parameter description to support other types.Andreas Fischer2012-11-161-1/+2
| | | | PHPBB3-11192
* [ticket/11192] Mark negative byte numbers as unsupported.Andreas Fischer2012-11-161-1/+1
| | | | PHPBB3-11192
* [ticket/11192] Add Tebibyte to get_formatted_filesize().Andreas Fischer2012-11-111-0/+6
| | | | PHPBB3-11192
* Merge remote-tracking branch 'github-igorw/ticket/11181-olympus' into ↵Nils Adermann2012-11-091-1/+1
|\ | | | | | | | | | | | | develop-olympus * github-igorw/ticket/11181-olympus: [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2) [develop-olympus]
| * [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2) [develop-olympus]Igor Wiedler2012-11-091-1/+1
| | | | | | | | PHPBB3-11181
* | [ticket/11158] Require acl_u_sig for ucp signature module.Oleg Pudeyev2012-10-291-1/+1
| | | | | | | | PHPBB3-11158
* | Merge remote-tracking branch 'p/ticket/10848' into develop-olympusAndreas Fischer2012-10-181-0/+30
|\ \ | | | | | | | | | | | | | | | | | | * p/ticket/10848: [ticket/10848] Move include up. [ticket/10848] Add phpbb_ prefix. [ticket/10848] Redirect from adm to installer correctly.
| * | [ticket/10848] Add phpbb_ prefix.Oleg Pudeyev2012-10-171-1/+1
| | | | | | | | | | | | PHPBB3-10848
| * | [ticket/10848] Redirect from adm to installer correctly.Oleg Pudeyev2012-10-171-0/+30
| | | | | | | | | | | | PHPBB3-10848
* | | Merge PR #918 branch 'Senky/ticket/10568' into develop-olympusOleg Pudeyev2012-10-171-1/+2
|\ \ \ | |/ / |/| | | | | | | | * Senky/ticket/10568: [ticket/10568] adding MESSAGE_EDITED to ucp.php and compose_pm
| * | [ticket/10568] adding MESSAGE_EDITED to ucp.php and compose_pmSenky2012-08-021-1/+2
| | | | | | | | | | | | PHPBB3-10568
* | | Merge PR #624 branch 'nickvergessen/ticket/8743' into develop-olympusOleg Pudeyev2012-10-161-2/+4
|\ \ \ | | | | | | | | | | | | | | | | * nickvergessen/ticket/8743: [ticket/8743] Include poster´s name in mail notifications
| * | | [ticket/8743] Include poster´s name in mail notificationsJoas Schilling2012-03-151-2/+4
| | | | | | | | | | | | | | | | PHPBB3-8743
* | | | Merge PR #917 branch 'Senky/ticket/10967' into develop-olympusOleg Pudeyev2012-10-161-2/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * Senky/ticket/10967: [ticket/10967] adding $root_path to posting_get_topic_icons
| * | | | [ticket/10967] adding $root_path to posting_get_topic_iconsSenky2012-10-111-2/+4
| | |/ / | |/| | | | | | | | | | PHPBB3-10967
* | | | [ticket/11112] updating links to phpbb.com to use SSLSenky2012-10-011-2/+2
| |_|/ |/| | | | | | | | PHPBB3-11112
* | | [task/functional] Fixed DEBUG_TEST related issuesDavid King2012-09-011-1/+5
| | | | | | | | | | | | PHPBB3-10758
* | | [task/functional] Allow tests to bypass certain restrictions with DEBUG_TESTDavid King2012-09-012-2/+5
| | | | | | | | | | | | PHPBB3-10758
* | | [ticket/11066] Remove debug code error_reporting(E_ALL) from mssqlnative.phpJordan Rogers2012-08-231-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For some reason, all errors are just flipped on before connecting to the database, despite the system as a whole having a different setting for displayable errors. Had to add & ~E_STRICT in PHP 5.4.5 to suppress Strict Standards messages, but I would assume that the db piece shouldn't be involved with setting error_reporting at all. PHPBB3-11066
* | | Merge branch 'prep-release-3.0.11' into develop-olympusAndreas Fischer2012-07-231-2/+5
|\ \ \ | | | | | | | | | | | | | | | | * prep-release-3.0.11: [ticket/10965] Profile data is only grabbed when show_novalue is enabled
| * | | [ticket/10965] Profile data is only grabbed when show_novalue is enabledNils Adermann2012-07-231-2/+5
| | | | | | | | | | | | | | | | PHPBB3-10965
* | | | Merge branch 'prep-release-3.0.11' into develop-olympusAndreas Fischer2012-07-231-0/+8
|\ \ \ \ | |/ / / | | | | | | | | | | | | * prep-release-3.0.11: [ticket/10965] Make sure all profile fields are always grabbed on viewtopic
| * | | [ticket/10965] Make sure all profile fields are always grabbed on viewtopicNils Adermann2012-07-231-0/+8
| | | | | | | | | | | | | | | | PHPBB3-10965
* | | | Merge branch 'prep-release-3.0.11' into develop-olympusAndreas Fischer2012-07-232-13/+24
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * prep-release-3.0.11: [ticket/10965] Database update was referring to 3.0.5 instead of 3.0.11-RC1 [ticket/10965] Introduce a new profile field option to display no value
| * | | [ticket/10965] Introduce a new profile field option to display no valueNils Adermann2012-07-232-13/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default the 3.0.10 behaviour is kept, profile fields will not show up if they have either not yet been selected or in case of an optional dropdown field if the novalue option was selected. PHPBB3-10965
* | | | Merge branch 'prep-release-3.0.11' into develop-olympusNils Adermann2012-07-211-83/+122
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.11: [ticket/10950] Fix grammar in comments [ticket/10950] Delete PMs for users that have not yet read the pm [ticket/10950] Fix unit tests to fit the new pm deleting behaviour [ticket/10950] Update undelivered pm counts in batches not 1 by 1 for each user [ticket/10950] Remove deleted entries in tests instead of commenting them out [ticket/10950] Use database count() and group by instead of doing that in php [ticket/10950] Check $delete_ids to be not empty [ticket/10950] Recreated the behaviour of phpbb_delete_user_pms() [ticket/10950] Fix unit tests to reflect desired behaviour [ticket/10950] Add some first and simple unit tests for phpbb_delete_user_pms() [ticket/10950] Correct comment for the second query. [ticket/10950] Add empty line to make unset() call more visible. [ticket/10950] Select the correct columns in SQL queries. [ticket/10950] Use a variable for the private message id. [ticket/10950] Move array initialisation to the front. [ticket/10950] Remove redundant if statement. [ticket/10950] Fix SQL coding style (indentation) in second SQL query. [ticket/10950] Use proper ' in order to fix comment.
| * | | Merge remote-tracking branch 'github-nickvergessen/ticket/10950' into ↵Nils Adermann2012-07-211-83/+122
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prep-release-3.0.11 * github-nickvergessen/ticket/10950: [ticket/10950] Fix grammar in comments [ticket/10950] Delete PMs for users that have not yet read the pm [ticket/10950] Fix unit tests to fit the new pm deleting behaviour [ticket/10950] Update undelivered pm counts in batches not 1 by 1 for each user [ticket/10950] Remove deleted entries in tests instead of commenting them out [ticket/10950] Use database count() and group by instead of doing that in php [ticket/10950] Check $delete_ids to be not empty [ticket/10950] Recreated the behaviour of phpbb_delete_user_pms() [ticket/10950] Fix unit tests to reflect desired behaviour [ticket/10950] Add some first and simple unit tests for phpbb_delete_user_pms() [ticket/10950] Correct comment for the second query. [ticket/10950] Add empty line to make unset() call more visible. [ticket/10950] Select the correct columns in SQL queries. [ticket/10950] Use a variable for the private message id. [ticket/10950] Move array initialisation to the front. [ticket/10950] Remove redundant if statement. [ticket/10950] Fix SQL coding style (indentation) in second SQL query. [ticket/10950] Use proper ' in order to fix comment.
| | * | | [ticket/10950] Fix grammar in commentsJoas Schilling2012-07-201-3/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-10950