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

Oembed warning if GD function is missing

Browse Source 
Silencing errors from a function is terrible so I've stopped that.

I've also added detection for if `imagecreatefromstring` is a declared function and a useful error is thrown if not
This commit is contained in:
Daniel Hensby 2014-04-24 09:10:24 +01:00
parent 346990c877
commit 0e58e97eea
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
oembed/Oembed.php
View File

@ -267,7 +267,10 @@ class Oembed_Result extends ViewableData {
if(!$data) { if(!$data) {
// if the response is no valid JSON we might have received a binary stream to an image // if the response is no valid JSON we might have received a binary stream to an image
$data = array(); $data = array();
$image = @imagecreatefromstring($body); if (!function_exists('imagecreatefromstring')) {
throw new LogicException('imagecreatefromstring function does not exist - Please make sure GD is installed');
}
$image = imagecreatefromstring($body);
if($image !== FALSE) { if($image !== FALSE) {
preg_match("/^(http:\/\/)?([^\/]+)/i", $this->url, $matches); preg_match("/^(http:\/\/)?([^\/]+)/i", $this->url, $matches);
$protocoll = $matches[1]; $protocoll = $matches[1];