| ... |
... |
@@ -116,14 +116,32 @@ |
| 116 |
116 |
#end |
| 117 |
117 |
#end |
| 118 |
118 |
#if ($attachmentRef) |
| 119 |
|
- #set ($attachmentResource = $services.model.serialize($attachmentRef, 'local')) |
|
119 |
+ #set ($attachmentResource = $services.rendering.escape($services.model.serialize($attachmentRef, 'local'), |
|
120 |
+ 'xwiki/2.1')) |
| 120 |
120 |
#else |
| 121 |
121 |
#set ($attachmentResource = '') |
| 122 |
122 |
#end |
|
124 |
+ #set ($escapedCssClass = $services.rendering.escape($!cssClass, 'xwiki/2.1')) |
| 123 |
123 |
#if ($displayImage) |
| 124 |
|
- (% class="${services.rendering.escape($!cssClass, 'xwiki/2.1')}#if (!$attachment) hidden#end" %)(((#if ("$!{attachmentResource}" != '' || $forceElement)#if($withLink)[[#end[[image:$services.rendering.escape(${attachmentResource}, 'xwiki/2.1')$!{imageParams}]]#if($withLink)>>attach:$services.rendering.escape(${attachmentResource},'xwiki/2.1')||rel=lightbox]]#{end}#end)))## |
|
126 |
+ (% class="${escapedCssClass}#if (!$attachment) hidden#end" %)(((## |
|
127 |
+ #if ("$!{attachmentResource}" != '' || $forceElement)## |
|
128 |
+ #if ($withLink)[[#{end}## |
|
129 |
+ [[image:${attachmentResource}$!{imageParams}]]## |
|
130 |
+ #if ($withLink)>>attach:${attachmentResource}||rel=lightbox]]#{end}## |
|
131 |
+ #{end}## |
|
132 |
+ )))## |
| 125 |
125 |
#else |
| 126 |
|
- (% class="${services.rendering.escape($!cssClass, 'xwiki/2.1')}" %)#if ("$!{attachmentResource}" != '' || $forceElement)#if ($withLink)[[attach:${attachmentResource}||rel=__blank]]#{else}(% class="displayed" %)#if($targetPermView)$!{services.rendering.escape($!{attachmentName}, 'xwiki/2.1')}#{else}Access Denied#{end}(% %)#{end}#end(%%)## |
|
134 |
+ (% class="${escapedCssClass}" %)## |
|
135 |
+ #if ("$!{attachmentResource}" != '' || $forceElement)## |
|
136 |
+ #if ($withLink)## |
|
137 |
+ [[attach:${attachmentResource}||rel=__blank]]## |
|
138 |
+ #{else}## |
|
139 |
+ (% class="displayed" %)## |
|
140 |
+ #if ($targetPermView)$!{services.rendering.escape($!{attachmentName}, 'xwiki/2.1')}#{else}Access Denied#{end}## |
|
141 |
+ (% %)## |
|
142 |
+ #{end}## |
|
143 |
+ #{end}## |
|
144 |
+ (%%)## |
| 127 |
127 |
#end |
| 128 |
128 |
#end |
| 129 |
129 |
|