From fcec5877680e5ad6f1852596707f631518c681b7 Mon Sep 17 00:00:00 2001
From: Jacob O'Mara <jacob.omara@ptfs-europe.com>
Date: Mon, 3 Jun 2024 15:04:38 +0100
Subject: [PATCH 1/2] feat: Make merge_javascript relative to file

This patch makes the merge_javascript script relative to the location of
the file and not the location that the script was called from. Ensures
the script will always run as intended regardless of where you ran the
script from.
---
 .../themes/responsive/js/merge_javascript.php          | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/code/web/interface/themes/responsive/js/merge_javascript.php b/code/web/interface/themes/responsive/js/merge_javascript.php
index 58a356a600..782c855555 100644
--- a/code/web/interface/themes/responsive/js/merge_javascript.php
+++ b/code/web/interface/themes/responsive/js/merge_javascript.php
@@ -1,16 +1,16 @@
 <?php
 header('Content-type: text/plain');
 date_default_timezone_set('America/Denver');
-$mergeListFile = fopen("./javascript_files.txt", 'r');
-$mergedFile = fopen("./aspen.js", 'w');
+$mergeListFile = fopen(__DIR__ . "/javascript_files.txt", 'r');
+$mergedFile = fopen(__DIR__ . "/aspen.js", 'w');
 while (($fileToMerge = fgets($mergeListFile)) !== false){
 	$fileToMerge = trim($fileToMerge);
 	if (strpos($fileToMerge, '#') !== 0){
-		if (file_exists($fileToMerge)){
-			fwrite($mergedFile, file_get_contents($fileToMerge, true));
+	    if (file_exists(__DIR__ . '/' . $fileToMerge)){
+		    fwrite($mergedFile, file_get_contents(__DIR__ . '/' . $fileToMerge, true));
 			fwrite($mergedFile, "\r\n");
 		}else{
-			echo("$fileToMerge does not exist\r\n");
+		    echo("$fileToMerge does not exist\r\n");
 		}
 	}
 }

From c807a4b76db175c4b646265ae947ccb55d5ba889 Mon Sep 17 00:00:00 2001
From: Jacob O'Mara <jacob.omara@ptfs-europe.com>
Date: Mon, 3 Jun 2024 15:08:35 +0100
Subject: [PATCH 2/2] chore: Update changelog

---
 code/web/release_notes/24.06.00.MD | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/code/web/release_notes/24.06.00.MD b/code/web/release_notes/24.06.00.MD
index 5f5154a167..8031774ae5 100644
--- a/code/web/release_notes/24.06.00.MD
+++ b/code/web/release_notes/24.06.00.MD
@@ -128,10 +128,17 @@
 - Added new Documentation links to several settings pages (*MKD*)
 - Updates to default user roles: removed testing roles and a couple uncommonly used roles; updated role titles (*MKD*)
 
+//Jacob - PTFS
+### Other Updates
+- Updated the merge_javascript.php script to be relative to the location of the file, not the location the script was ran from (*JOM*)
+
 ## This release includes code contributions from
 - ByWater Solutions
   - Mark Noble (MDN)
   - Kirstin Kroeger (KK)
   - Kodi Lein (KL)
   - Liz Rea (LR)
-  - Morgan Daigneault (MKD)
\ No newline at end of file
+  - Morgan Daigneault (MKD)
+
+- PTFS-Europe
+  - Jacob O'Mara (JOM)