FIX Try Catch for embeded media (silverstripe#9424)

* Try Catch for embeded media * added missing namespaces, translatable message INVALID_URL * generate tag only once * catch after closing bracket * space after comma * Update src/View/Shortcodes/EmbedShortcodeProvider.php * Linting Co-authored-by: [email protected] <[email protected]> Co-authored-by: Steve Boyd <[email protected]> Co-authored-by: Loz Calver <[email protected]>
creative-commoners · Jul 17, 2020 · 56f15b1 · 56f15b1
1 parent e341e0a
commit 56f15b1
Showing 1 changed file with 20 additions and 1 deletion.
diff --git a/src/View/Shortcodes/EmbedShortcodeProvider.php b/src/View/Shortcodes/EmbedShortcodeProvider.php
@@ -14,7 +14,9 @@
 use SilverStripe\View\Parsers\ShortcodeHandler;
 use Embed\Adapters\Adapter;
 use Embed\Embed;
+use Embed\Exceptions\InvalidUrlException;
 use SilverStripe\View\Parsers\ShortcodeParser;
+use SilverStripe\Control\Director;
 
 /**
  * Provider for the [embed] shortcode tag used by the embedding service
@@ -89,7 +91,24 @@ public static function handle_shortcode($arguments, $content, $parser, $shortcod
         }
 
         // Process embed
-        $embed = $embed->getEmbed();
+        try {
+            $embed = $embed->getEmbed();
+        } catch (InvalidUrlException $e) {
+            $message = (Director::isDev())
+                ? $e->getMessage()
+                : _t(__CLASS__ . '.INVALID_URL', 'There was a problem loading the media.');
+
+            $attr = [
+                'class' => 'ss-media-exception embed'
+            ];
+
+            $result = HTML::createTag(
+                'div',
+                $attr,
+                HTML::createTag('p', [], $message)
+            );
+            return $result;
+        }
 
         // Convert embed object into HTML
         if ($embed && $embed instanceof Adapter) {