Merge pull request #907 from annando/master

oembed: There seems to be some bug with ombed (maybe passing a non working url)

database.sql

@@ -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',
   `bdyear` char(4) NOT NULL COMMENT 'birthday notify flag',
   `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`),
   KEY `uid` (`uid`),
   KEY `self` (`self`),

include/oembed.php

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