Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
X
xwiki-platform
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
XWiki
xwiki-platform
Commits
aac4d6d5
Commit
aac4d6d5
authored
3 years ago
by
Thomas Mortagne
Browse files
Options
Downloads
Patches
Plain Diff
XWIKI-19002: Impossible to share macros between Velocity macros in a top level wiki template
parent
f59a7395
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/internal/template/TemplateAsyncRenderer.java
+9
-1
9 additions, 1 deletion
...om/xpn/xwiki/internal/template/TemplateAsyncRenderer.java
with
9 additions
and
1 deletion
xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/internal/template/TemplateAsyncRenderer.java
+
9
−
1
View file @
aac4d6d5
...
...
@@ -203,7 +203,15 @@ private void transform(Block block) throws TransformationException
new
TransformationContext
(
block
instanceof
XDOM
?
(
XDOM
)
block
:
new
XDOM
(
Arrays
.
asList
(
block
)),
this
.
renderingContext
.
getDefaultSyntax
(),
this
.
renderingContext
.
isRestricted
());
transformationContext
.
setId
(
this
.
transformationId
);
// Use the Transformation id as the name passed to the Velocity Engine. This name is used internally
// by Velocity as a cache index key for caching macros.
String
tId
=
this
.
renderingContext
.
getTransformationId
();
if
(
tId
==
null
)
{
// We need to set a top level id (otherwise Velocity macros won't be able to share vmacros for example)
tId
=
this
.
template
.
getId
()
!=
null
?
this
.
template
.
getId
()
:
"unknown namespace"
;
}
transformationContext
.
setId
(
tId
);
transformationContext
.
setTargetSyntax
(
this
.
targetSyntax
);
transform
(
block
,
transformationContext
);
...
...
This diff is collapsed.
Click to expand it.
Git Mirror User
@gitmirror
mentioned in commit
61909949
·
3 years ago
mentioned in commit
61909949
mentioned in commit 61909949a3fc23952f93a1df43a906f70a2b5fe8
Toggle commit list
Git Mirror User
@gitmirror
mentioned in commit
0e180d1a
·
3 years ago
mentioned in commit
0e180d1a
mentioned in commit 0e180d1aa1467ff4792beb9e1d1a52eeae8bdfae
Toggle commit list
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment