Merge remote-tracking branch 'friendica/master'

4 files changed, 18 insertions, 2 deletions

diff --git a/include/bbcode.php b/include/bbcode.php
index a8e3bed70..5218a06e8 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -11,7 +11,7 @@ function stripcode_br_cb($s) {
 
 function tryoembed($match){
 	$url = ((count($match)==2)?$match[1]:$match[2]);
-	logger('tryoembed: $url');
+	logger("tryoembed: $url");
 	
 	$o = oembed_fetch_url($url);
 
diff --git a/include/conversation.php b/include/conversation.php
index 0c319e802..9cc5c258b 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -294,7 +294,7 @@ function conversation(&$a, $items, $mode, $update) {
 				$arr = array('item' => $item, 'output' => $tmp_item);
 				call_hooks('display_item', $arr);
 
-				$threads[$threadsid]['id'] = $arr[$item['item_id']];
+				$threads[$threadsid]['id'] = $item['item_id'];
 				$threads[$threadsid]['html'] .= $arr['output'];
 
 			}
diff --git a/include/diaspora.php b/include/diaspora.php
index 7f1e4a8e3..fdf756610 100644
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -188,6 +188,13 @@ function diaspora_msg_build($msg,$user,$contact,$prvkey,$pubkey,$public = false)
 
 	logger('diaspora_msg_build: ' . $msg, LOGGER_DATA);
 
+	// without a public key nothing will work
+
+	if(! $pubkey) {
+		logger('diaspora_msg_build: pubkey missing: contact id: ' . $contact['id']);
+		return '';
+	}
+
 	$inner_aes_key = random_string(32);
 	$b_inner_aes_key = base64_encode($inner_aes_key);
 	$inner_iv = random_string(16);
@@ -1672,6 +1679,12 @@ function diaspora_profile($importer,$xml) {
 
 	$birthday = datetime_convert('UTC','UTC',$birthday,'Y-m-d');
 
+	// this is to prevent multiple birthday notifications in a single year
+	// if we already have a stored birthday and the 'm-d' part hasn't changed, preserve the entry, which will preserve the notify year
+
+	if(substr($birthday,5) === substr($contact['bd'],5))
+		$birthday = $contact['bd'];
+
 	$r = q("UPDATE `contact` SET `name` = '%s', `name-date` = '%s', `photo` = '%s', `thumb` = '%s', `micro` = '%s', `avatar-date` = '%s' , `bd` = '%s' WHERE `id` = %d AND `uid` = %d LIMIT 1",
 		dbesc($name),
 		dbesc(datetime_convert()),
diff --git a/include/socgraph.php b/include/socgraph.php
index 60bf075d3..79d7340a4 100644
--- a/include/socgraph.php
+++ b/include/socgraph.php
@@ -58,6 +58,9 @@ function poco_load($cid,$uid = 0,$url = null) {
 
 	logger('poco_load: json: ' . print_r($j,true),LOGGER_DATA);
 
+	if(! isset($j->entry))
+		return;
+
 	$total = 0;
 	foreach($j->entry as $entry) {