1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 04:23:38 +01:00

7189 Commits

Author SHA1 Message Date
Nils Adermann
3985bdbc1b Merge pull request #1199 from imkingdavid/ticket/11334
[ticket/11334] Properly generate controller URL with helper url() method
2013-04-03 06:44:15 -07:00
Nils Adermann
a7cf2bdace Merge pull request #1323 from t-backoff/ticket/11477
Ticket/11477
2013-03-31 15:57:26 -07:00
Tabitha Backoff
5d669ed1c5 Changing effectively_installed function to check if the config var is set. 2013-03-31 18:46:25 -04:00
Nils Adermann
78dc1c84c8 Merge pull request #1316 from nickvergessen/ticket/11405
Ticket/11405 Users that are subscribed to a forum, should receive notifications for new replies
2013-03-31 15:02:48 -07:00
Nils Adermann
8231b881ad Merge pull request #1287 from erangamapa/ticket/11106
[ticket/11106] Undefined index EDITED_TIME_TOTAL notice.
2013-03-31 14:54:23 -07:00
Nils Adermann
fd7db5cc1f Merge pull request #1296 from bantu/ticket/11440
[ticket/11440] Cast values of the $user_ids array to integer before sql_in_set.
2013-03-31 14:42:43 -07:00
Nils Adermann
133307b6bf Merge pull request #1300 from bantu/ticket/11451
[ticket/11445] Add abstract class phpbb_notification_method_messenger_ba...
2013-03-29 08:58:40 -07:00
Andreas Fischer
b156b22f35 [ticket/11403] Use an instance of phpbb_db_sql_insert_buffer instead.
PHPBB3-11403
2013-03-29 16:53:50 +01:00
Andreas Fischer
6910d44154 [ticket/11403] phpbb_notification_manager: Use SQL multi insert in batches.
PHPBB3-11403
2013-03-29 16:37:04 +01:00
Tabitha Backoff
a8f5695666 Migration file and change board_home_text to board_index_text 2013-03-28 17:53:14 -04:00
Tabitha Backoff
9e5cde7f66 Ticket# 11477 - Allow customisation of "Board index" 2013-03-28 02:34:36 -04:00
Andreas Fischer
4bd5f279dc [ticket/11469] Add comment about using bitwise operator.
PHPBB3-11469
2013-03-28 00:28:51 +01:00
Andreas Fischer
1bd13acb75 [ticket/11469] Use multi insert property from DB. Do not copy value to buffer.
PHPBB3-11469
2013-03-28 00:28:50 +01:00
Andreas Fischer
4132573088 [ticket/11469] Use buffer with a single element instead of extra code path.
PHPBB3-11469
2013-03-28 00:28:50 +01:00
Joas Schilling
c9f059c4f2 [ticket/11469] Cast $result to boolean in insert_all()
|= returns integer values

PHPBB3-11469
2013-03-27 20:55:48 +01:00
Andreas Fischer
53f9e2131c [ticket/11469] Add note about calling flush() after batch insert is done.
PHPBB3-11469
2013-03-27 19:27:27 +01:00
Andreas Fischer
dc766f29b4 [ticket/11469] Have all methods of phpbb_db_sql_insert_buffer provide feedback.
PHPBB3-11469
2013-03-27 19:19:26 +01:00
Andreas Fischer
8c5fcac232 [ticket/11469] Add benefits over collecting huge insert arrays to class doc.
PHPBB3-11469
2013-03-27 18:22:59 +01:00
Andreas Fischer
55fb87ff18 Merge remote-tracking branch 'nickvergessen/ticket/bantu/11469' into 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
2013-03-27 18:11:49 +01:00
Andreas Fischer
43b6ae3fee Merge remote-tracking branch 'phpbb/develop' into ticket/11469
* 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.
2013-03-27 18:11:38 +01:00
Andreas Fischer
94a15f85a6 [ticket/11469] Add example code to class documentation.
PHPBB3-11469
2013-03-27 18:11:31 +01:00
Joas Schilling
c629b2c7b3 [ticket/11476] Remove pass-by-reference from sql_mutli_insert
The method never writes to the array passed by reference. So it can be
passed by value instead to avoid certain problems.

PHPBB3-11476
2013-03-27 15:01:36 +01:00
Joas Schilling
bf6f2c5875 [ticket/11469] Return after sql_multi_insert when multi_insert is false
PHPBB3-11469
2013-03-27 14:00:47 +01:00
David King
6dddc22ec7 [ticket/11448] Use of $user_id parameter to mark a user's notifications read
Currently, the $user_id is a parameter but is not used. This patch fixes that.

PHPBB3-11448
2013-03-26 17:07:20 -04:00
Joas Schilling
d8a63047aa [ticket/11474] Clarify comment with "global" and forum_id = 0
Forum ID 0 in permission checks, checks the global moderator permission.

PHPBB3-11405
PHPBB3-11474
2013-03-26 20:20:51 +01:00
Joas Schilling
1af89968dd [ticket/11474] Check read permission before sending *_in_queue notifications
PHPBB3-11405
PHPBB3-11474
2013-03-26 20:20:26 +01:00
Joas Schilling
81cf02e057 [ticket/11405] Order users in bookmark, in order to pass postgres tests
PHPBB3-11405
2013-03-26 13:54:33 +01:00
Andreas Fischer
fc8bf3f3c7 [ticket/11469] Add comment about using sql_multi_insert when not buffering.
PHPBB3-11469
2013-03-25 17:01:44 +01:00
Joas Schilling
1259117d21 [ticket/11405] Sort $users array in order to prevent issues on postgres
PHPBB3-11405
2013-03-25 15:07:06 +01:00
Joas Schilling
a91ffe06c7 [ticket/11405] Send post notifications to forum subscribers
Like in 3.0 we should also send notifications about new posts to users
that subscribed to the forum. (Subscriptions are verbose)

PHPBB3-11405
2013-03-25 09:28:53 +01:00
Andreas Fischer
16a6025372 [ticket/11469] Add SQL insert buffer allowing easier handling of multi inserts.
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
2013-03-21 23:12:31 +01:00
Oleg Pudeyev
8b464e87f0 Merge PR #1298 branch 'nickvergessen/ticket/11438' into develop
# 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()
2013-03-20 11:43:14 -04:00
Andreas Fischer
c9e7247ab4 [ticket/11445] Add abstract class phpbb_notification_method_messenger_base.
PHPBB3-11445
2013-03-16 21:50:30 +01:00
Joas Schilling
c50af28077 [ticket/11438] Add spaces after # comment start and before \ line breaks
PHPBB3-11438
2013-03-16 01:18:15 +01:00
erangamapa
21a9462553 [ticket/11106] Added missing line breaks.
Added two missing line breaks into 'edited by' message.

PHPBB3-11106
2013-03-16 00:05:12 +05:30
Joas Schilling
3b0cdc5362 [ticket/11334] Allow parameters to be specified in the route
PHPBB3-11334
2013-03-15 15:21:15 +01:00
Joas Schilling
076711d9a9 [ticket/11334] Use mocks instead of making parameters optional
PHPBB3-11334
2013-03-15 09:18:14 -04:00
Joas Schilling
ff9a0e4ef4 [ticket/11334] Expand functionality of helper->url()
Expanded the functionality of helper->url() to support all parameters of
append_sid() itself.

PHPBB3-11334
2013-03-15 09:18:12 -04:00
David King
5850a2cbf6 [ticket/11334] Remove extraneous period
PHPBB3-11334
2013-03-15 09:18:10 -04:00
David King
5e89ce1898 [ticket/11334] Make url helper method public
PHPBB3-11334
2013-03-15 09:18:08 -04:00
David King
d3e2fae66d [ticket/11334] Add a test for the controller helper URL method
PHPBB3-11334
2013-03-15 09:18:07 -04:00
David King
8c512b0d2d [ticket/11334] Properly generate controller URL until paths issue gets fixed
PHPBB3-11334
2013-03-15 09:18:06 -04:00
Joas Schilling
2b2bbf787c [ticket/11438] Add helpful comments from sample config to ACP output
PHPBB3-11438
2013-03-15 08:23:39 +01:00
Andreas Fischer
1694dc6e28 [ticket/11440] Cast values of the $user_ids array to integer before sql_in_set.
PHPBB3-11440
2013-03-15 01:22:00 +01:00
Andreas Fischer
b17c0aa098 [ticket/11440] Remove useless/incorrect comment.
PHPBB3-11440
2013-03-15 01:21:12 +01:00
Nathan Guse
d4ee7718b9 Merge remote-tracking branch 'remotes/Marc/ticket/11404' into develop
# 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
2013-03-12 14:48:07 -05:00
Joas Schilling
5eef287646 [ticket/11310] Add hashes to action links to prevent CSRF attacks
PHPBB3-11310
2013-03-12 17:19:30 +01:00
erangamapa
df98de971c [ticket/11106] Undefined index EDITED_TIME_TOTAL notice.
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
2013-03-12 10:19:29 +05:30
Nathaniel Guse
d6930df7a2 Merge remote-tracking branch 'remotes/dhruv/ticket/11303' into develop
# 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
2013-03-09 19:08:51 -06:00
Nathaniel Guse
3f5d938a95 Merge remote-tracking branch 'remotes/marc/ticket/11323' into develop
# 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
2013-03-09 19:02:44 -06:00