aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | Merge pull request #1287 from erangamapa/ticket/11106Nils Adermann2013-03-311-2/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | [ticket/11106] Undefined index EDITED_TIME_TOTAL notice.
| * | | | | | | | | [ticket/11106] Added missing line breaks.erangamapa2013-03-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added two missing line breaks into 'edited by' message. PHPBB3-11106
| * | | | | | | | | [ticket/11106] Undefined index EDITED_TIME_TOTAL notice.erangamapa2013-03-121-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When viewing a private message, when message edit count is 1 Undefined index EDITED_TIME_TOTAL php notice appears. Changed the message formatting method to what is used in viewtopic.php. PHPBB3-11106
* | | | | | | | | | Merge pull request #1296 from bantu/ticket/11440Nils Adermann2013-03-311-2/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | [ticket/11440] Cast values of the $user_ids array to integer before sql_in_set.
| * | | | | | | | | | [ticket/11440] Cast values of the $user_ids array to integer before sql_in_set.Andreas Fischer2013-03-151-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11440
| * | | | | | | | | | [ticket/11440] Remove useless/incorrect comment.Andreas Fischer2013-03-151-1/+0
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11440
* | | | | | | | | | Merge pull request #1300 from bantu/ticket/11451Nils Adermann2013-03-293-93/+103
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | [ticket/11445] Add abstract class phpbb_notification_method_messenger_ba...
| * | | | | | | | | | [ticket/11445] Add abstract class phpbb_notification_method_messenger_base.Andreas Fischer2013-03-163-93/+103
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11445
* | | | | | | | | | [ticket/11403] Use an instance of phpbb_db_sql_insert_buffer instead.Andreas Fischer2013-03-291-14/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11403
* | | | | | | | | | [ticket/11403] phpbb_notification_manager: Use SQL multi insert in batches.Andreas Fischer2013-03-291-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11403
* | | | | | | | | | Merge pull request #1285 from EXreaction/ticket/11422Nils Adermann2013-03-291-4/+6
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | [ticket/11422] Increment assets when database_update is complete
| * | | | | | | | | | [ticket/11422] Increment assets when database_update is completeNathaniel Guse2013-03-101-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11422
* | | | | | | | | | | [ticket/11469] Add comment about using bitwise operator.Andreas Fischer2013-03-281-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11469
* | | | | | | | | | | [ticket/11469] Use multi insert property from DB. Do not copy value to buffer.Andreas Fischer2013-03-281-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11469
* | | | | | | | | | | [ticket/11469] Use buffer with a single element instead of extra code path.Andreas Fischer2013-03-281-11/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11469
* | | | | | | | | | | [ticket/11469] Cast $result to boolean in insert_all()Joas Schilling2013-03-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |= returns integer values PHPBB3-11469
* | | | | | | | | | | [ticket/11469] Add note about calling flush() after batch insert is done.Andreas Fischer2013-03-271-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11469
* | | | | | | | | | | [ticket/11469] Have all methods of phpbb_db_sql_insert_buffer provide feedback.Andreas Fischer2013-03-271-6/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11469
* | | | | | | | | | | [ticket/11469] Add benefits over collecting huge insert arrays to class doc.Andreas Fischer2013-03-271-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11469
* | | | | | | | | | | Merge remote-tracking branch 'nickvergessen/ticket/bantu/11469' into ↵Andreas Fischer2013-03-271-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ticket/11469 * nickvergessen/ticket/bantu/11469: [ticket/11469] Use method to check config count, instead of repeating it [ticket/11469] Return after sql_multi_insert when multi_insert is false [ticket/11469] Add some basic unit tests for phpbb_db_sql_insert_buffer
| * | | | | | | | | | | [ticket/11469] Return after sql_multi_insert when multi_insert is falseJoas Schilling2013-03-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11469
* | | | | | | | | | | | Merge remote-tracking branch 'phpbb/develop' into ticket/11469Andreas Fischer2013-03-273-6/+7
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * phpbb/develop: [ticket/11476] Remove pass-by-reference from sql_mutli_insert [ticket/11466] Remove old database driver files from PHPUnit exclude [ticket/11448] Use of $user_id parameter to mark a user's notifications read [ticket/11460] Add default behaviour tests for notification and email types. [ticket/11460] Configure functional test board email using dummy SMTP data. [ticket/11460] Add test for whether post_email and topic_email are checked. [ticket/11460] Add methods for checkbox handling to phpbb_functional_test_case. [ticket/11460] Drop incorrect phpbb_notification_{type,method}_ prefix.
| * | | | | | | | | | | [ticket/11476] Remove pass-by-reference from sql_mutli_insertJoas Schilling2013-03-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The method never writes to the array passed by reference. So it can be passed by value instead to avoid certain problems. PHPBB3-11476
| * | | | | | | | | | | Merge remote-tracking branch 'github-bantu/ticket/11460' into developNils Adermann2013-03-271-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-bantu/ticket/11460: [ticket/11460] Add default behaviour tests for notification and email types. [ticket/11460] Configure functional test board email using dummy SMTP data. [ticket/11460] Add test for whether post_email and topic_email are checked. [ticket/11460] Add methods for checkbox handling to phpbb_functional_test_case. [ticket/11460] Drop incorrect phpbb_notification_{type,method}_ prefix.
| | * | | | | | | | | | | [ticket/11460] Drop incorrect phpbb_notification_{type,method}_ prefix.Andreas Fischer2013-03-191-4/+4
| | | |_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11460
| * | | | | | | | | | | [ticket/11448] Use of $user_id parameter to mark a user's notifications readDavid King2013-03-261-0/+1
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, the $user_id is a parameter but is not used. This patch fixes that. PHPBB3-11448
* | | | | | | | | | | [ticket/11469] Add example code to class documentation.Andreas Fischer2013-03-271-0/+15
| |_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11469
* | | | | | | | | | [ticket/11469] Add comment about using sql_multi_insert when not buffering.Andreas Fischer2013-03-251-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11469
* | | | | | | | | | [ticket/11469] Add SQL insert buffer allowing easier handling of multi inserts.Andreas Fischer2013-03-211-0/+111
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Tries to prevent going over max packet size by flushing to the database after a certain number of rows have been added. 2. Because of 1., it is less likely to reach a connection timeout when inserting a huge number of rows. 3. By flushing the buffer when a certain size is reached, memory usage should be lower compared to building the whole insert row set first. PHPBB3-11469
* | | | | | | | | Merge PR #1298 branch 'nickvergessen/ticket/11438' into developOleg Pudeyev2013-03-203-70/+41
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling # Via Joas Schilling * nickvergessen/ticket/11438: [ticket/11438] Add spaces after # comment start and before \ line breaks [ticket/11438] Add helpful comments from sample config to ACP output [ticket/11438] Add empty sql_query_pre to delta-source [ticket/11438] Move backslash to concatenate the query strings correctly [ticket/11438] Update sphinx.sample.conf to one provided by config_generate()
| * | | | | | | | [ticket/11438] Add spaces after # comment start and before \ line breaksJoas Schilling2013-03-163-38/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11438
| * | | | | | | | [ticket/11438] Add helpful comments from sample config to ACP outputJoas Schilling2013-03-151-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11438
| * | | | | | | | [ticket/11438] Add empty sql_query_pre to delta-sourceJoas Schilling2013-03-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11438
| * | | | | | | | [ticket/11438] Move backslash to concatenate the query strings correctlyJoas Schilling2013-03-151-60/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Was broken in 03d2c6413c25b1faf7f37ff20625ce986b19eb88 PHPBB3-11438
| * | | | | | | | [ticket/11438] Update sphinx.sample.conf to one provided by config_generate()Joas Schilling2013-03-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11438
* | | | | | | | | [ticket/11455] Restore alphabetic order (underscore first) in config/tables.ymlAndreas Fischer2013-03-171-2/+2
| |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11455
* | | | | | | | Merge remote-tracking branch 'remotes/Marc/ticket/11404' into developNathan Guse2013-03-121-0/+17
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Marc Alexander # Via Marc Alexander * remotes/Marc/ticket/11404: [ticket/11404] Remove version ID from manager_test.php file header [ticket/11404] Add tests for phpbb_avatar_manager::clean_row() [ticket/11404] Convert manager_test to UNIX line endings [ticket/11404] Use a default data row if $row is empty in clean_row() [ticket/11404] Return empty array of avatar data if $row is empty
| * | | | | | | | [ticket/11404] Use a default data row if $row is empty in clean_row()Marc Alexander2013-03-071-10/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A statically defined $default_row will be used inside the phpbb_avatar_manager::clean_row() method if the $row passed to it is empty. PHPBB3-11404
| * | | | | | | | [ticket/11404] Return empty array of avatar data if $row is emptyMarc Alexander2013-03-061-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While creating a group in the acp, the group data ($group_row) is empty. Due to that array_combine in phpbb_avatar_manager::clean_row() will cause PHP Warnings. In addition to that the required indexes 'avatar', 'avatar_width', 'avatar_height', and 'avatar_type' won't be defined. This patch will solve that issue. PHPBB3-11404
* | | | | | | | | Merge remote-tracking branch 'remotes/Marc/ticket/11433' into developNathan Guse2013-03-121-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Marc Alexander # Via Marc Alexander * remotes/Marc/ticket/11433: [ticket/11433] Rename CSS class "jalert" to "phpbb_alert"
| * | | | | | | | | [ticket/11433] Rename CSS class "jalert" to "phpbb_alert"Marc Alexander2013-03-121-1/+1
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This missing change caused the loading info to appear during ajax requests. With this patch it will be properly hidden as it should. PHPBB3-11433
* | | | | | | | | [ticket/11310] Add hashes to action links to prevent CSRF attacksJoas Schilling2013-03-121-6/+15
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11310
* | | | | | | | Merge remote-tracking branch 'remotes/dhruv/ticket/11303' into developNathaniel Guse2013-03-095-4/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Dhruv # Via Dhruv * remotes/dhruv/ticket/11303: [ticket/11303] rename attribute to timezone-preselect [ticket/11303] remove additional brackets [ticket/11303] use S_TZ_PRESELECT in subsilver [ticket/11303] add S_TZ_PRESELECT template var
| * | | | | | | | [ticket/11303] rename attribute to timezone-preselectDhruv2013-02-174-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11303
| * | | | | | | | [ticket/11303] remove additional bracketsDhruv2013-02-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11303
| * | | | | | | | [ticket/11303] use S_TZ_PRESELECT in subsilverDhruv2013-02-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11303
| * | | | | | | | [ticket/11303] add S_TZ_PRESELECT template varDhruv2013-02-082-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add a new template variable to check if timezone has already been selected by the user while registeration. PHPBB3-11303
* | | | | | | | | Merge remote-tracking branch 'remotes/marc/ticket/11323' into developNathaniel Guse2013-03-091-1/+12
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Marc Alexander # Via Marc Alexander * remotes/marc/ticket/11323: [ticket/11323] Reduce additional code and revert regex to previous one [ticket/11323] Enable tests for inclusion of defined variables [ticket/11323] Correctly treat variables in template defines
| * | | | | | | | | [ticket/11323] Reduce additional code and revert regex to previous oneMarc Alexander2013-02-261-7/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11323
| * | | | | | | | | [ticket/11323] Correctly treat variables in template definesMarc Alexander2013-02-191-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, any template variables that were used when defining a variable were treated as strings. This is a regression to phpBB 3.0. With this patch the template variables will be properly parsed. PHPBB3-11323