Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
project
drupal
Commits
f08a96ea
Commit
f08a96ea
authored
Oct 23, 2016
by
Alex Pott
Browse files
Issue
#2819593
by dawehner, webflo: Link title double escaping in Link::preRenderLink
parent
515a55e7
Changes
3
Hide whitespace changes
Inline
Side-by-side
core/lib/Drupal/Core/Render/Element/Link.php
View file @
f08a96ea
...
...
@@ -92,7 +92,7 @@ public static function preRenderLink($element) {
/** @var \Drupal\Core\Utility\LinkGenerator $link_generator */
$link_generator
=
\
Drupal
::
service
(
'link_generator'
);
$generated_link
=
$link_generator
->
generate
(
$element
[
'#title'
],
$element
[
'#url'
]
->
setOptions
(
$options
));
$element
[
'#markup'
]
=
$generated_link
->
getGeneratedLink
()
;
$element
[
'#markup'
]
=
$generated_link
;
$generated_link
->
merge
(
BubbleableMetadata
::
createFromRenderArray
(
$element
))
->
applyTo
(
$element
);
}
...
...
core/modules/system/src/Tests/Theme/EngineTwigTest.php
View file @
f08a96ea
...
...
@@ -77,6 +77,7 @@ public function testTwigLinkGenerator() {
$link_generator
=
$this
->
container
->
get
(
'link_generator'
);
$generated_url
=
Url
::
fromRoute
(
'user.register'
,
[],
[
'absolute'
=>
TRUE
])
->
toString
(
TRUE
)
->
getGeneratedUrl
();
$expected
=
[
'link via the linkgenerator: '
.
$link_generator
->
generate
(
'register'
,
new
Url
(
'user.register'
,
[],
[
'absolute'
=>
TRUE
])),
'link via the linkgenerator: '
.
$link_generator
->
generate
(
'register'
,
new
Url
(
'user.register'
,
[],
[
'absolute'
=>
TRUE
,
'attributes'
=>
[
'foo'
=>
'bar'
]])),
...
...
@@ -84,6 +85,7 @@ public function testTwigLinkGenerator() {
'link via the linkgenerator: '
.
$link_generator
->
generate
(
'register'
,
new
Url
(
'user.register'
,
[],
[
'attributes'
=>
[
'id'
=>
'kitten'
]])),
'link via the linkgenerator: '
.
$link_generator
->
generate
(
'register'
,
new
Url
(
'user.register'
,
[],
[
'attributes'
=>
[
'class'
=>
[
'llama'
,
'kitten'
,
'panda'
]]])),
'link via the linkgenerator: '
.
$link_generator
->
generate
(
Markup
::
create
(
'<span>register</span>'
),
new
Url
(
'user.register'
,
[],
[
'absolute'
=>
TRUE
])),
'link via the linkgenerator: <a href="'
.
$generated_url
.
'"><span>register</span><svg></svg></a>'
,
];
// Verify that link() has the ability to bubble cacheability metadata:
...
...
core/modules/system/tests/modules/twig_theme_test/templates/twig_theme_test.link_generator.html.twig
View file @
f08a96ea
...
...
@@ -5,3 +5,5 @@
<div>
link via the linkgenerator:
{{
link
(
'register'
,
'route:user.register'
,
attributes
)
}}
</div>
{%
set
title
%}
<span>
register
</span>
{%
endset
%}
<div>
link via the linkgenerator:
{{
link
(
title
,
test_url
)
}}
</div>
{%
set
title
%}
<span>
register
</span><svg></svg>
{%
endset
%}
<div>
link via the linkgenerator:
{{
link
(
title
,
test_url
)
}}
</div>
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment