1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00

Merge branch 'develop-ascraeus' into develop

This commit is contained in:
Marc Alexander
2014-08-21 00:44:27 +02:00
51 changed files with 327 additions and 212 deletions

View File

@@ -21,20 +21,20 @@ class phpbb_functional_notification_test extends phpbb_functional_test_case
return array(
// Rows inserted by phpBB/install/schemas/schema_data.sql
// Also see PHPBB3-11460
array('post_notification', true),
array('topic_notification', true),
array('post_email', true),
array('topic_email', true),
array('notification.type.post_notification', true),
array('notification.type.topic_notification', true),
array('notification.type.post_notification.method.email', true),
array('notification.type.topic_notification.method.email', true),
// Default behaviour for in-board notifications:
// If user did not opt-out, in-board notifications are on.
array('bookmark_notification', true),
array('quote_notification', true),
array('notification.type.bookmark_notification', true),
array('notification.type.quote_notification', true),
// Default behaviour for email notifications:
// If user did not opt-in, email notifications are off.
array('bookmark_email', false),
array('quote_email', false),
array('notification.type.bookmark_notification.method.email', false),
array('notification.type.quote_notification.method.email', false),
);
}