Merge branch 'main' into issue-525

Author: isc-tleavitt

CHANGELOG.md

@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 - Fixed display of other users' username in workspace view on Unix (#530)
 - Fix left-sidebar spacing (#525)
+- Fixed slowness loading some CSP pages with multiple instances sharing a webserver (#540)
 
 ## [2.6.0] - 2024-10-07
 

cls/SourceControl/Git/StreamServer.cls

@@ -7,7 +7,7 @@ Class SourceControl.Git.StreamServer Extends %CSP.StreamServer
 ClassMethod OnPage() As %Status
 {
     if (%stream '= $$$NULLOREF) && $data(%base)#2 {
-        set sourceControlInclude = ##class(SourceControl.Git.Utils).GetSourceControlInclude(%request.URLPrefix)
+        set sourceControlInclude = ##class(SourceControl.Git.Utils).GetSourceControlInclude()
         while '%stream.AtEnd {
             set text = %stream.Read()
             set text = $replace(text,"{{baseHref}}",..EscapeHTML(%base))

cls/SourceControl/Git/Utils.cls

@@ -2571,7 +2571,7 @@ ClassMethod GetPackageVersion() As %String [ CodeMode = objectgenerator ]
     quit $$$OK
 }
 
-ClassMethod GetSourceControlInclude(prefix As %String = "") As %String
+ClassMethod GetSourceControlInclude(prefix As %String = {%request.URLPrefix}) As %String
 {
     quit $select(##class(%Library.EnsembleMgr).IsEnsembleInstalled():
         "<script type=""text/javascript"" src="""_prefix_"/isc/studio/templates/ensemble/Ens_SourceControl.js""></script>",