tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #9600 from creative-commoners/pulls/4.6/embedded-media

Browse Source 
Try Catch for embeded media - Backport to 4.6
This commit is contained in:
Guy Marriott 2020-07-17 10:32:10 -07:00 committed by GitHub
commit 87200439be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/View/Shortcodes/EmbedShortcodeProvider.php
View File

@ -14,7 +14,9 @@ use SilverStripe\View\HTML;
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 @@ class EmbedShortcodeProvider implements ShortcodeHandler
}
// Process embed
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) {