XWiki export doesn't work properly when a diagram is present. xwikis…

…as#311

 * Small fixes

application-diagram-ui/src/main/resources/Diagram/DiagramMacro.xml

@@ -268,10 +268,13 @@
         #if ($xcontext.action == 'export' && $diagramObj.getValue('exportUsingSVG') == 0
             && $diagram.getAttachment($pngFileName))
           #set ($fileName = $pngFileName)
+          #set ($diagramURL = $diagram.getAttachmentURL($fileName, 'download', "v=$!diagram.version"))
+          #set ($output = "{{html clean='false'}}<img src='$diagramURL' alt='$escapetool.xml($diagramTitle)'/>{{/html}}")
         #elseif ($xcontext.action == 'export')
           #set ($diagram = $xwiki.getDocument($reference))
           #set ($output = "{{html}}<div>$diagram.getAttachment('diagram.svg').getContentAsString()</div>{{/html}}")
         #else
+          ## If we reached this branch it means that we are in 'view' mode, and we should use the svg.
           #set ($diagramURL = $diagram.getAttachmentURL($fileName, 'download', "v=$!diagram.version"))
           #set ($output = "{{html clean='false'}}<img src='$diagramURL' alt='$escapetool.xml($diagramTitle)'/>{{/html}}")
         #end