|
@@ -118,7 +118,7 @@ discard block |
|
|
block discarded – undo |
|
118
|
118
|
if ($type == 'edit') |
|
119
|
119
|
{ |
|
120
|
120
|
// Filter out members who have already been notified about this post's topic |
|
121
|
|
- $unnotified = array_filter($watched, function ($member) |
|
|
121
|
+ $unnotified = array_filter($watched, function($member) |
|
122
|
122
|
{ |
|
123
|
123
|
return empty($member['sent']); |
|
124
|
124
|
}); |
|
@@ -204,8 +204,7 @@ discard block |
|
|
block discarded – undo |
|
204
|
204
|
if (!empty($member_data['id_topic']) && $type != 'topic' && !empty($prefs[$member_id])) |
|
205
|
205
|
{ |
|
206
|
206
|
$pref = !empty($prefs[$member_id]['topic_notify_' . $topicOptions['id']]) ? |
|
207
|
|
- $prefs[$member_id]['topic_notify_' . $topicOptions['id']] : |
|
208
|
|
- (!empty($prefs[$member_id]['topic_notify']) ? $prefs[$member_id]['topic_notify'] : 0); |
|
|
207
|
+ $prefs[$member_id]['topic_notify_' . $topicOptions['id']] : (!empty($prefs[$member_id]['topic_notify']) ? $prefs[$member_id]['topic_notify'] : 0); |
|
209
|
208
|
|
|
210
|
209
|
$message_type = 'notification_' . $type; |
|
211
|
210
|
|
|
@@ -224,8 +223,7 @@ discard block |
|
|
block discarded – undo |
|
224
|
223
|
elseif ($type == 'topic') |
|
225
|
224
|
{ |
|
226
|
225
|
$pref = !empty($prefs[$member_id]['board_notify_' . $topicOptions['board']]) ? |
|
227
|
|
- $prefs[$member_id]['board_notify_' . $topicOptions['board']] : |
|
228
|
|
- (!empty($prefs[$member_id]['board_notify']) ? $prefs[$member_id]['board_notify'] : 0); |
|
|
226
|
+ $prefs[$member_id]['board_notify_' . $topicOptions['board']] : (!empty($prefs[$member_id]['board_notify']) ? $prefs[$member_id]['board_notify'] : 0); |
|
229
|
227
|
|
|
230
|
228
|
$content_type = 'board'; |
|
231
|
229
|
|
Please login to merge, or discard this patch.