mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'phpbb/develop' into ticket/11469

Browse Source 
* 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.
This commit is contained in:
Andreas Fischer
2013-03-27 18:11:38 +01:00
parent 94a15f85a6 b583f6d8d9
commit 43b6ae3fee
8 changed files with 133 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/includes/db/driver/driver.php
View File

@@ -568,12 +568,12 @@ class phpbb_db_driver
* Run more than one insert statement.
*
* @param string $table table name to run the statements on
* @param array &$sql_ary multi-dimensional array holding the statement data.
* @param array $sql_ary multi-dimensional array holding the statement data.
*
* @return bool false if no statements were executed.
* @access public
*/
function sql_multi_insert($table, &$sql_ary)
function sql_multi_insert($table, $sql_ary)
{
if (!sizeof($sql_ary))
{

1
phpBB/includes/notification/manager.php
View File

@@ -256,6 +256,7 @@ class phpbb_notification_manager
SET notification_read = 1
WHERE notification_time <= " . (int) $time .
(($item_type !== false) ? ' AND ' . (is_array($item_type) ? $this->db->sql_in_set('item_type', $item_type) : " item_type = '" . $this->db->sql_escape($item_type) . "'") : '') .
(($user_id !== false) ? ' AND ' . (is_array($user_id) ? $this->db->sql_in_set('user_id', $user_id) : 'user_id = ' . (int) $user_id) : '') .
(($item_id !== false) ? ' AND ' . (is_array($item_id) ? $this->db->sql_in_set('item_id', $item_id) : 'item_id = ' . (int) $item_id) : '');
$this->db->sql_query($sql);
}

8
phpBB/install/schemas/schema_data.sql
View File

@@ -777,9 +777,9 @@ INSERT INTO phpbb_extensions (group_id, extension) VALUES (9, 'ogg');
INSERT INTO phpbb_extensions (group_id, extension) VALUES (9, 'ogm');
# User Notification Options (for first user)
INSERT INTO phpbb_user_notifications (item_type, item_id, user_id, method) VALUES('phpbb_notification_type_post', 0, 2, '');
INSERT INTO phpbb_user_notifications (item_type, item_id, user_id, method) VALUES('phpbb_notification_type_post', 0, 2, 'phpbb_notification_method_email');
INSERT INTO phpbb_user_notifications (item_type, item_id, user_id, method) VALUES('phpbb_notification_type_topic', 0, 2, '');
INSERT INTO phpbb_user_notifications (item_type, item_id, user_id, method) VALUES('phpbb_notification_type_topic', 0, 2, 'phpbb_notification_method_email');
INSERT INTO phpbb_user_notifications (item_type, item_id, user_id, method) VALUES('post', 0, 2, '');
INSERT INTO phpbb_user_notifications (item_type, item_id, user_id, method) VALUES('post', 0, 2, 'email');
INSERT INTO phpbb_user_notifications (item_type, item_id, user_id, method) VALUES('topic', 0, 2, '');
INSERT INTO phpbb_user_notifications (item_type, item_id, user_id, method) VALUES('topic', 0, 2, 'email');
# POSTGRES COMMIT #