diff --git a/sql/1804.sql b/sql/1804.sql index ddfda3d9185f0e7e606905334edc5945ba4f26c4..57c22c42e2815a11e8e7d51bb0a0a4697c365c10 100755 --- a/sql/1804.sql +++ b/sql/1804.sql @@ -198,6 +198,8 @@ CREATE OR REPLACE VIEW res_view_letterbox AS r.source, r.author, r.reference_number, + r.external_id, + r.external_link, r.custom_t1 AS doc_custom_t1, r.custom_t2 AS doc_custom_t2, r.custom_t3 AS doc_custom_t3, @@ -769,6 +771,6 @@ UPDATE notifications SET event_id = 'baskets' WHERE notification_id = 'BASKETS'; DELETE FROM parameters where id = 'user_quota'; INSERT INTO parameters (id, param_value_string, param_value_int, param_value_date) VALUES ('user_quota', '', 0, NULL); DELETE FROM parameters where id = 'database_version'; -INSERT INTO parameters (id, param_value_string, param_value_int, param_value_date) VALUES ('database_version', '18.04.1', NULL, NULL); +INSERT INTO parameters (id, param_value_string, param_value_int, param_value_date) VALUES ('database_version', '18.04.2', NULL, NULL); INSERT INTO templates_doctype_ext SELECT null, d.type_id, 'N' FROM doctypes d LEFT JOIN templates_doctype_ext tde ON d.type_id = tde.type_id WHERE tde.type_id IS NULL; diff --git a/sql/data_fr.sql b/sql/data_fr.sql index 4765be86e2669dbaea19560992e1d0d190f0de72..643d8b196ad4aa0444cfdd887a2550f79e0c9e42 100755 --- a/sql/data_fr.sql +++ b/sql/data_fr.sql @@ -1162,7 +1162,7 @@ INSERT INTO parameters (id, param_value_string, param_value_int, param_value_dat INSERT INTO parameters (id, param_value_string, param_value_int, param_value_date) VALUES ('folder_id_increment', '', 200, NULL); INSERT INTO parameters (id, param_value_string, param_value_int, param_value_date) VALUES ('work_batch_autoimport_id', NULL, 1, NULL); INSERT INTO parameters (id, param_value_string, param_value_int, param_value_date) VALUES ('postindexing_workbatch', NULL, 1, NULL); -INSERT INTO parameters (id, param_value_string, param_value_int, param_value_date) VALUES ('database_version', '18.04.1', NULL, NULL); +INSERT INTO parameters (id, param_value_string, param_value_int, param_value_date) VALUES ('database_version', '18.04.2', NULL, NULL); INSERT INTO parameters (id, param_value_string, param_value_int, param_value_date) VALUES ('user_quota', '', 0, NULL); ------------ --DIFFLIST_TYPES diff --git a/src/core/models/SecurityModel.php b/src/core/models/SecurityModel.php index a03d530ea02b535c8b02225039790d16f9220d5c..e26f0879650949a6656746c439d3f0b582cc99d3 100644 --- a/src/core/models/SecurityModel.php +++ b/src/core/models/SecurityModel.php @@ -96,7 +96,7 @@ class SecurityModel $cookieKey = $user[0]['cookie_key']; } - $cookiePath = str_replace(['apps/maarch_entreprise/index.php', 'rest/index.php'], '', $_SERVER['SCRIPT_NAME']); + $cookiePath = str_replace(['apps/maarch_entreprise/index.php', 'apps/maarch_entreprise/log.php', 'rest/index.php'], '', $_SERVER['SCRIPT_NAME']); $cookieTime = time() + 60 * $cookieTime; DatabaseModel::update([