Merge branch '3.2.x'

This commit is contained in:
Marc Alexander 2017-01-06 13:53:43 +01:00
commit 49b2269155
No known key found for this signature in database
GPG key ID: 50E0D2423696F995

View file

@ -456,6 +456,12 @@ class post extends \phpbb\notification\type\base
return array();
}
return array('notification_data' => $serialized_data);
$data_array = array_merge(array(
'post_time' => $post['post_time'],
'post_id' => $post['post_id'],
'topic_id' => $post['topic_id']
), $this->get_data(false));
return $data_array;
}
}