From 9971d2ea070923efc4abf6ade8e274bfa484324d Mon Sep 17 00:00:00 2001
From: SilverYoCha <yohann.chastagnier@silverpeas.com>
Date: Tue, 8 Nov 2022 12:15:41 +0100
Subject: [PATCH] Bug #13232: fixing technical error if no content language is
 used when displaying all public attachment versions

---
 .../src/main/webapp/attachment/jsp/publicVersions.jsp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/core-war/src/main/webapp/attachment/jsp/publicVersions.jsp b/core-war/src/main/webapp/attachment/jsp/publicVersions.jsp
index b1137060796..fe58ab281bc 100644
--- a/core-war/src/main/webapp/attachment/jsp/publicVersions.jsp
+++ b/core-war/src/main/webapp/attachment/jsp/publicVersions.jsp
@@ -99,13 +99,14 @@
   <view:browseBar extraInformations="${requestScope.Document.title}" clickable="false"/>
 
   <%
-    final String arrayUrl = UriBuilder.fromPath("ViewAllVersions")
+    UriBuilder uriBuilder = UriBuilder.fromPath("ViewAllVersions")
         .queryParam("DocId", id)
         .queryParam("ComponentId", componentId)
-        .queryParam("fromAlias", fromAlias)
-        .queryParam("Language", contentLanguage)
-        .build().toString();
-    ArrayPane arrayPane = gef.getArrayPane("List", arrayUrl, request, session);
+        .queryParam("fromAlias", fromAlias);
+    if (StringUtil.isDefined(contentLanguage)) {
+      uriBuilder = uriBuilder.queryParam("Language", contentLanguage);
+    }
+    ArrayPane arrayPane = gef.getArrayPane("List", uriBuilder.build().toString(), request, session);
 
 // header of the array
     ArrayColumn arrayColumn_version = arrayPane.addArrayColumn(messages.getString("version"));