allow custom avatar sizes - needed for Diaspora hcard/vcard

include/items.php

@@ -995,6 +995,11 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $secure_fee
 
 	require_once('library/simplepie/simplepie.inc');
 
+	if(! strlen($xml)) {
+		logger('consume_feed: empty input');
+		return;
+	}
+		
 	$feed = new SimplePie();
 	$feed->set_raw_data($xml);
 	if($datedir)

include/text.php

@@ -732,6 +732,9 @@ function link_compare($a,$b) {
 	return false;
 }}
 
+// Given an item array, convert the body element from bbcode to html and add smilie icons.
+// If attach is true, also add icons for item attachments
+
 
 if(! function_exists('prepare_body')) {
 function prepare_body($item,$attach = false) {
@@ -771,6 +774,9 @@ function prepare_body($item,$attach = false) {
 	return $s;
 }}
 
+
+// Given a text string, convert from bbcode to html and add smilie icons.
+
 if(! function_exists('prepare_text')) {
 function prepare_text($text) {