mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2026-02-12 19:02:35 +01:00
Fix max
This commit is contained in:
@@ -16120,8 +16120,6 @@ function show_actions_messaging($conf, $langs, $db, $filterobj, $objcon = null,
|
||||
$sql .= ", o.ref";
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
$sql .= " FROM " . MAIN_DB_PREFIX . "actioncomm as a";
|
||||
$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "user as u on u.rowid = a.fk_user_action";
|
||||
$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_actioncomm as c ON a.fk_action = c.id";
|
||||
@@ -16310,7 +16308,7 @@ function show_actions_messaging($conf, $langs, $db, $filterobj, $objcon = null,
|
||||
$sql2 .= " AND mc.fk_mailing=m.rowid";
|
||||
}
|
||||
|
||||
$MAXWITHOUTPAGINATION = getDolGlobalInt('AGENDA_MAX_EVENTS_ON_PAGE_WITHOUT_PAGINATION', 10);
|
||||
$MAXWITHOUTPAGINATION = getDolGlobalInt('AGENDA_MAX_EVENTS_ON_PAGE_WITHOUT_PAGINATION', 100);
|
||||
|
||||
if ($sql || $sql2) { // May not be defined if module Agenda is not enabled and mailing module disabled too
|
||||
if (!empty($sql) && !empty($sql2)) {
|
||||
|
||||
Reference in New Issue
Block a user