Support non-namespaced href attribute

The SVG 2 specification deprecated usage of the xlink namespace when specifying resource references (href attribute) in supported SVG elements. https://svgwg.org/svg2-draft/linking.html#XLinkRefAttrs
dompdf · Sep 6, 2022 · 76876c6 · 76876c6
1 parent 058524e
commit 76876c6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/Svg/Tag/Image.php b/src/Svg/Tag/Image.php
@@ -52,6 +52,10 @@ public function start($attributes)
             $this->href = $attributes['xlink:href'];
         }
 
+        if (isset($attributes['href'])) {
+            $this->href = $attributes['href'];
+        }
+
         $this->document->getSurface()->transform(1, 0, 0, -1, 0, $height);
 
         $this->document->getSurface()->drawImage($this->href, $this->x, $this->y, $this->width, $this->height);

diff --git a/src/Svg/Tag/UseTag.php b/src/Svg/Tag/UseTag.php
@@ -38,7 +38,7 @@ protected function before($attributes)
 
         $document = $this->getDocument();
 
-        $link = $attributes["xlink:href"];
+        $link = $attributes["href"] ?? $attributes["xlink:href"];
         $this->reference = $document->getDef($link);
 
         if ($this->reference) {