Merge branch 'hotfix_diaspora' into develop

2016-01-20 08:50:18 +01:00
parent 1811ccc43d c6b0e57aa4
commit 7e83ba090f
4 changed files with 41 additions and 48 deletions
--- a/include/items.php
+++ b/include/items.php
@@ -2643,7 +2643,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)

 		logger('consume_feed: feed item count = ' . $feed->get_item_quantity());

-	// in inverse date order
+		// in inverse date order
 		if ($datedir)
 			$items = array_reverse($feed->get_items());
 		else