XWIKI-22673: Syntax [[...]] in terminal page breaks rendering and ind…

…exing of content (cherry picked from commit 358cc4c)
xwiki · Nov 21, 2024 · 8699732 · 8699732
1 parent 738001c
commit 8699732
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/...g/xwiki/rendering/internal/resolver/AbstractResourceReferenceEntityReferenceResolver.java b/...g/xwiki/rendering/internal/resolver/AbstractResourceReferenceEntityReferenceResolver.java
@@ -186,7 +186,7 @@ protected DocumentReference resolveDocumentReference(EntityReference sourceRefer
                 new SpaceReference(reference.getName(), (SpaceReference) reference.getParent());
             finalReference = new DocumentReference(defaultDocumentName, spaceReference);
 
-            if (trySpaceSibling
+            if (sourceReference != null && trySpaceSibling
                 && trySpaceSiblingFallback(sourceReference, finalReference, baseReference, defaultDocumentName)) {
                 // Try as a space sibling.
                 DocumentReference siblingReference =

diff --git a/...wiki/rendering/internal/resolver/DefaultResourceReferenceEntityReferenceResolverTest.java b/...wiki/rendering/internal/resolver/DefaultResourceReferenceEntityReferenceResolverTest.java
@@ -248,6 +248,13 @@ public void resolveUntypeDocument() throws ComponentLookupException
         assertEquals(new DocumentReference(CURRENT_WIKI, CURRENT_SPACE, PAGE),
             this.mocker.getComponentUnderTest().resolve(documentResource(PAGE, false), null));
 
+        // When the reference cannot be parsed by the relative resolver
+
+        assertEquals(
+            new DocumentReference(CURRENT_WIKI,
+                Arrays.asList(CURRENT_SPACE, CURRENT_SPACE, CURRENT_SPACE, CURRENT_PAGE), DEFAULT_PAGE),
+            this.mocker.getComponentUnderTest().resolve(documentResource("...", false), null));
+
         // When the page is current page
 
         assertEquals(new DocumentReference(CURRENT_WIKI, CURRENT_SPACE, CURRENT_PAGE),