From f0936d4c1ec88670d20dd67f9d5ab020ee4438d9 Mon Sep 17 00:00:00 2001
From: Steve Boyd <emteknetnz@gmail.com>
Date: Mon, 27 Jul 2020 18:04:03 +1200
Subject: [PATCH] FIX Set iframe dimension attributes specified in shortcode

---
 src/View/Shortcodes/EmbedShortcodeProvider.php        | 11 +++++++++++
 .../View/Shortcodes/EmbedShortcodeProviderTest.php    |  6 +++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/View/Shortcodes/EmbedShortcodeProvider.php b/src/View/Shortcodes/EmbedShortcodeProvider.php
index d3f4aebf5..720c84888 100644
--- a/src/View/Shortcodes/EmbedShortcodeProvider.php
+++ b/src/View/Shortcodes/EmbedShortcodeProvider.php
@@ -141,6 +141,17 @@ class EmbedShortcodeProvider implements ShortcodeHandler
             $arguments['style'] = 'width: ' . intval($arguments['width']) . 'px;';
         }
 
+        // override iframe dimension attributes provided by webservice with ones specified in shortcode arguments
+        foreach (['width', 'height'] as $attr) {
+            if (!($value = $arguments[$attr] ?? false)) {
+                continue;
+            }
+            foreach (['"', "'"] as $quote) {
+                $rx = "/(<iframe .*?)$attr=$quote([0-9]+)$quote([^>]+>)/";
+                $content = preg_replace($rx, "$1{$attr}={$quote}{$value}{$quote}$3", $content);
+            }
+        }
+
         $data = [
             'Arguments' => $arguments,
             'Attributes' => static::buildAttributeListFromArguments($arguments, ['width', 'height', 'url', 'caption']),
diff --git a/tests/php/View/Shortcodes/EmbedShortcodeProviderTest.php b/tests/php/View/Shortcodes/EmbedShortcodeProviderTest.php
index 58ea889ed..379970c68 100644
--- a/tests/php/View/Shortcodes/EmbedShortcodeProviderTest.php
+++ b/tests/php/View/Shortcodes/EmbedShortcodeProviderTest.php
@@ -37,8 +37,8 @@ class EmbedShortcodeProviderTest extends SapphireTest
             [
                 'url' => static::$test_youtube,
                 'caption' => 'A nice video',
-                'width' => 480,
-                'height' => 360,
+                'width' => 777,
+                'height' => 437,
             ],
             [
                 'version' => '1.0',
@@ -58,7 +58,7 @@ class EmbedShortcodeProviderTest extends SapphireTest
         );
         $this->assertEqualIgnoringWhitespace(
             <<<EOS
-<div style="width: 480px;"><iframe width="480" height="270" src="https://www.youtube.com/embed/dM15HfUYwF0?feature=oembed" frameborder="0" allowfullscreen></iframe>
+<div style="width: 777px;"><iframe width="777" height="437" src="https://www.youtube.com/embed/dM15HfUYwF0?feature=oembed" frameborder="0" allowfullscreen></iframe>
 <p class="caption">A nice video</p></div>
 EOS
             ,