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

BUGFIX: return a meaningful translatable string when resource is invalid

Browse Source
This commit is contained in:
Mateusz Uzdowski 2012-05-24 14:28:47 +12:00
parent bb29ff3611
commit 63ed0cba32
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
forms/HtmlEditorField.php
View File

@ -810,7 +810,17 @@ class HtmlEditorField_Embed extends HtmlEditorField_File {
parent::__construct($url, $file); parent::__construct($url, $file);
$this->oembed = Oembed::get_oembed_from_url($url); $this->oembed = Oembed::get_oembed_from_url($url);
if(!$this->oembed) { if(!$this->oembed) {
return Controller::curr()->httpError(404, 'The URL ' . $url . ' could not be turned into a media resource.'); $controller = Controller::curr();
$controller->response->addHeader('X-Status',
rawurlencode(_t(
'HtmlEditorField.URLNOTANOEMBEDRESOURCE',
"The URL '{url}' could not be turned into a media resource.",
"The URL that has been passed is not a valid Oembed resource, and the embed element could not be created.",
array('url' => $url)
)));
$controller->response->setStatusCode(404);
throw new SS_HTTPResponse_Exception($controller->response);
} }
} }