preserve complete URLs if context is set to

wocommunity · May 19, 2015 · 6df92d9 · 6df92d9
1 parent 9969288
commit 6df92d9
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Frameworks/Core/ERExtensions/Sources/er/extensions/components/_private/ERXWOForm.java b/Frameworks/Core/ERExtensions/Sources/er/extensions/components/_private/ERXWOForm.java
@@ -376,7 +376,7 @@ public void appendAttributesToResponse(WOResponse response, WOContext context) {
 		boolean generatingCompleteURLs = context.doesGenerateCompleteURLs();
 		boolean requestIsSecure = context.secureMode();
 		boolean switchToCompleteURLs = secure ^ requestIsSecure;
-		if (switchToCompleteURLs) {
+		if (switchToCompleteURLs && !generatingCompleteURLs) {
 			context.generateCompleteURLs();
 		}
 		try {
@@ -407,7 +407,7 @@ else if (_directActionName != null || _actionClass != null) {
 			}
 		}
 		finally {
-			if (switchToCompleteURLs) {
+			if (switchToCompleteURLs && !generatingCompleteURLs) {
 				context.generateRelativeURLs();
 			}
 		}