Merge branch 'ent-7064-no-se-muestran-los-mensajes' into 'develop'
fixed error not show messages See merge request artica/pandorafms!3859
This commit is contained in:
commit
abdfe6b77f
|
@ -497,11 +497,7 @@ function messages_get_overview(
|
||||||
if ($incl_source_info) {
|
if ($incl_source_info) {
|
||||||
$source_fields = ', tns.*';
|
$source_fields = ', tns.*';
|
||||||
$source_join = 'INNER JOIN tnotification_source tns
|
$source_join = 'INNER JOIN tnotification_source tns
|
||||||
ON tns.id=tm.id_source
|
ON tns.id=tm.id_source';
|
||||||
INNER JOIN tnotification_source_user nsu
|
|
||||||
ON nsu.id_source=tns.id
|
|
||||||
AND nsu.enabled = 1
|
|
||||||
OR tns.enabled = 1';
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Using distinct because could be double assignment due group/user.
|
// Using distinct because could be double assignment due group/user.
|
||||||
|
|
|
@ -209,23 +209,6 @@ if (($new_msg) && (!empty($dst_user)) && (!$reply)) {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Create message (destination group).
|
|
||||||
if (($new_msg) && ($dst_group != '') && (!$reply)) {
|
|
||||||
$return = messages_create_message(
|
|
||||||
$config['id_user'],
|
|
||||||
[],
|
|
||||||
[$dst_group],
|
|
||||||
$subject,
|
|
||||||
$message
|
|
||||||
);
|
|
||||||
|
|
||||||
ui_print_result_message(
|
|
||||||
$return,
|
|
||||||
__('Message successfully sent'),
|
|
||||||
__('Error sending message to group %s', groups_get_name($dst_group))
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Message creation form.
|
// Message creation form.
|
||||||
// User info.
|
// User info.
|
||||||
$own_info = get_user_info($config['id_user']);
|
$own_info = get_user_info($config['id_user']);
|
||||||
|
|
Loading…
Reference in New Issue