Merge pull request #63 from Jacobomara901/merge_javascript_relative_fix

Merge javascript relative fix

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");
 		}
 	}
 }

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)
+  - Morgan Daigneault (MKD)
+
+- PTFS-Europe
+  - Jacob O'Mara (JOM)