Merge pull request #907 from annando/master

oembed: There seems to be some bug with ombed (maybe passing a non working url)
This commit is contained in:
Tobias Diekershoff 2014-02-03 22:32:00 -08:00
commit 8d47965b3a
2 changed files with 6 additions and 0 deletions

View file

@ -184,6 +184,8 @@ CREATE TABLE IF NOT EXISTS `contact` (
`profile-id` int(11) NOT NULL DEFAULT '0' COMMENT 'which profile to display - 0 is public default', `profile-id` int(11) NOT NULL DEFAULT '0' COMMENT 'which profile to display - 0 is public default',
`bdyear` char(4) NOT NULL COMMENT 'birthday notify flag', `bdyear` char(4) NOT NULL COMMENT 'birthday notify flag',
`bd` date NOT NULL, `bd` date NOT NULL,
`notify_new_posts` TINYINT(1) NOT NULL DEFAULT '0',
`fetch_further_information` TINYINT(1) NOT NULL DEFAULT '0',
PRIMARY KEY (`id`), PRIMARY KEY (`id`),
KEY `uid` (`uid`), KEY `uid` (`uid`),
KEY `self` (`self`), KEY `self` (`self`),

View file

@ -62,6 +62,10 @@ function oembed_fetch_url($embedurl){
} }
$j = json_decode($txt); $j = json_decode($txt);
if (!is_object($j))
return false;
$j->embedurl = $embedurl; $j->embedurl = $embedurl;
return $j; return $j;
} }