diff options
| author | Nils Adermann <naderman@naderman.de> | 2013-11-01 07:58:18 -0700 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2013-11-01 07:58:18 -0700 |
| commit | e118b4f4c0dbca5912f11e0954fa422f36a58353 (patch) | |
| tree | a4b06c160aa28839fd3bb949be1724ff55aa8ee2 /phpBB/phpbb/notification/manager.php | |
| parent | 652365158ab3f788a1a7b31e6e599198d19cc6f7 (diff) | |
| parent | ae7ef3e09dd284b8876ad74de16321c373d251af (diff) | |
| download | forums-e118b4f4c0dbca5912f11e0954fa422f36a58353.tar forums-e118b4f4c0dbca5912f11e0954fa422f36a58353.tar.gz forums-e118b4f4c0dbca5912f11e0954fa422f36a58353.tar.bz2 forums-e118b4f4c0dbca5912f11e0954fa422f36a58353.tar.xz forums-e118b4f4c0dbca5912f11e0954fa422f36a58353.zip | |
Merge pull request #1839 from bantu/task/code-sniffer
More PHP Code Sniffer rules
Diffstat (limited to 'phpBB/phpbb/notification/manager.php')
| -rw-r--r-- | phpBB/phpbb/notification/manager.php | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/phpBB/phpbb/notification/manager.php b/phpBB/phpbb/notification/manager.php index b92b247c74..d77a936413 100644 --- a/phpBB/phpbb/notification/manager.php +++ b/phpBB/phpbb/notification/manager.php @@ -10,14 +10,6 @@ namespace phpbb\notification; /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ - exit; -} - -/** * Notifications service class * @package notifications */ @@ -262,8 +254,7 @@ class manager SET notification_read = 1 WHERE notification_time <= " . (int) $time . (($notification_type_name !== false) ? ' AND ' . - (is_array($notification_type_name) ? $this->db->sql_in_set('notification_type_id', $this->get_notification_type_ids($notification_type_name)) : 'notification_type_id = ' . $this->get_notification_type_id($notification_type_name)) - : '') . + (is_array($notification_type_name) ? $this->db->sql_in_set('notification_type_id', $this->get_notification_type_ids($notification_type_name)) : 'notification_type_id = ' . $this->get_notification_type_id($notification_type_name)) : '') . (($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); @@ -285,8 +276,7 @@ class manager SET notification_read = 1 WHERE notification_time <= " . (int) $time . (($notification_type_name !== false) ? ' AND ' . - (is_array($notification_type_name) ? $this->db->sql_in_set('notification_type_id', $this->get_notification_type_ids($notification_type_name)) : 'notification_type_id = ' . $this->get_notification_type_id($notification_type_name)) - : '') . + (is_array($notification_type_name) ? $this->db->sql_in_set('notification_type_id', $this->get_notification_type_ids($notification_type_name)) : 'notification_type_id = ' . $this->get_notification_type_id($notification_type_name)) : '') . (($item_parent_id !== false) ? ' AND ' . (is_array($item_parent_id) ? $this->db->sql_in_set('item_parent_id', $item_parent_id) : 'item_parent_id = ' . (int) $item_parent_id) : '') . (($user_id !== false) ? ' AND ' . (is_array($user_id) ? $this->db->sql_in_set('user_id', $user_id) : 'user_id = ' . (int) $user_id) : ''); $this->db->sql_query($sql); |