From 6e7d158287f0013959bf3e7edc7b452421596835 Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Tue, 23 Jan 2024 17:04:31 +0100
Subject: [PATCH] changed timestamp to git_merge_ts in header.php

---
 Layout/default/header.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Layout/default/header.php b/Layout/default/header.php
index 9313717d4..69f06c620 100644
--- a/Layout/default/header.php
+++ b/Layout/default/header.php
@@ -9,17 +9,17 @@
         <link rel="shortcut icon" href="<?=self::getResourcePath()?>assets/images/favicon.ico">
 
         <!-- App css -->
-        <link href="<?=self::getResourcePath()?>fontawesome/css/all.min.css?<?=date('U')?>" rel="stylesheet" type="text/css" />
-        <link href="<?=self::getResourcePath()?>assets/css/bootstrap.min.css?<?=date('U')?>" rel="stylesheet" type="text/css" />
+        <link href="<?=self::getResourcePath()?>fontawesome/css/all.min.css?<?=$git_merge_ts?>" rel="stylesheet" type="text/css" />
+        <link href="<?=self::getResourcePath()?>assets/css/bootstrap.min.css?<?=$git_merge_ts?>" rel="stylesheet" type="text/css" />
         <link href="<?=self::getResourcePath()?>assets/css/icons.css" rel="stylesheet" type="text/css" />
-        <link href="<?=self::getResourcePath()?>assets/css/app.css?<?=date('U')?>" rel="stylesheet" type="text/css" />
+        <link href="<?=self::getResourcePath()?>assets/css/app.css?<?=$git_merge_ts?>" rel="stylesheet" type="text/css" />
         <link href="<?=self::getResourcePath()?>assets/css/leaflet.css" rel="stylesheet" type="text/css" />
-        <link href="<?=self::getResourcePath()?>assets/css/thetool.css?<?=date('U')?>" rel="stylesheet" type="text/css" />
+        <link href="<?=self::getResourcePath()?>assets/css/thetool.css?<?=$git_merge_ts?>" rel="stylesheet" type="text/css" />
         <link href="<?=self::getResourcePath()?>assets/libs/select2/select2.min.css" rel="stylesheet" type="text/css" />
         <link href="<?=self::getResourcePath()?>assets/css/bootstrap-select.min.css" rel="stylesheet" type="text/css" />
         <link href="<?=self::getResourcePath()?>css/bootstrap-datepicker3.min.css" rel="stylesheet" type="text/css" />
         <link href="<?=self::getResourcePath()?>plugins/summernote/summernote-bs4.css" rel="stylesheet" type="text/css" />
-        <link href="<?=self::getResourcePath()?>datatables/datatables.min.css?<?=date('U')?>" rel="stylesheet" type="text/css" />
+        <link href="<?=self::getResourcePath()?>datatables/datatables.min.css?<?=$git_merge_ts?>" rel="stylesheet" type="text/css" />
         
         <?php if(isset($additionalCSS) && is_array($additionalCSS) && count($additionalCSS)): ?>
           <?php foreach($additionalCSS as $css): ?>
@@ -38,7 +38,7 @@
         <script type="text/javascript" src="<?=self::getResourcePath()?>js/bootstrap.min.js"></script>
         <script type="text/javascript" src="<?=self::getResourcePath()?>assets/js/bootstrap-select.min.js"></script>
         <script type="text/javascript" src="<?=self::getResourcePath()?>js/bootstrap-autocomplete.min.js"></script>
-        <script type="text/javascript" src="<?=self::getResourcePath()?>datatables/datatables.min.js?<?=date('U')?>"></script>
+        <script type="text/javascript" src="<?=self::getResourcePath()?>datatables/datatables.min.js?<?=$git_merge_ts?>"></script>
         
         <?php if(isset($additionalJS) && is_array($additionalJS) && count($additionalJS)): ?>
           <?php foreach($additionalJS as $js): ?>