Merge pull request #21 from uppsala-university/IG-3720_contextUrls

Ig 3720 context urls
bogeblad · Apr 27, 2016 · 882d887 · 882d887
2 parents 3e48d1d + aa20f8d
commit 882d887
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/src/java/org/infoglue/deliver/controllers/kernel/impl/simple/BasicURLComposer.java b/src/java/org/infoglue/deliver/controllers/kernel/impl/simple/BasicURLComposer.java
@@ -839,10 +839,6 @@ else if(operatingMode.equalsIgnoreCase("2"))
 				if (isDecoratedUrl || isDecorated)
 				{
 					String componentRendererUrl = CmsPropertyHandler.getComponentRendererUrl();
-					if(componentRendererUrl.endsWith("/"))
-					{
-						componentRendererUrl += "/";
-					}
 
 					url = componentRendererUrl + CmsPropertyHandler.getComponentRendererAction() + "?" + arguments;
 				}

diff --git a/src/java/org/infoglue/deliver/invokers/PageInvoker.java b/src/java/org/infoglue/deliver/invokers/PageInvoker.java
@@ -185,6 +185,7 @@ public void deliverPage() throws NoBaseTemplateFoundException, Exception
 			logger.info("PageCache:" + this.getDeliveryContext().getDisablePageCache());
 		}
 
+
 		LanguageVO languageVO = LanguageDeliveryController.getLanguageDeliveryController().getLanguageVO(getDatabase(), this.getTemplateController().getLanguageId());
 
 		if(logger.isInfoEnabled())
@@ -661,6 +662,7 @@ protected String decorateHeadAndPageWithVarsFromComponents(String pageString)
 
 			if(sb != null)
 				pageString = sb.toString();			
+
 
 		return pageString;
 	}