1 files changed, 9 insertions, 4 deletions
diff --git a/templates/part.items.php b/templates/part.items.php
index 16b7d5b67..3d9c366d6 100644
--- a/templates/part.items.php
+++ b/templates/part.items.php
@@ -40,13 +40,18 @@ foreach($items as $item) {
 			echo '</ul>';
 		echo '</div>';
 
-		echo '<h1 class="item_title"><a target="_blank" href="' . $item->getUrl() . '">' . $item->getTitle() . '</a></h1>';	
-
-		echo '<h2 class="item_author">' . $l->t('from') . ' ' . parse_url($item->getUrl(), PHP_URL_HOST) . '</h2>';
-		
 		echo '<h2 class="item_date"><time class="timeago" datetime="' . 
 			date('c', $item->getDate()) . '">' . date('F j, Y, g:i a', $item->getDate()) .  '</time>' . '</h2>';
 
+		echo '<h1 class="item_title"><a target="_blank" href="' . $item->getUrl() . '">' . $item->getTitle() . '</a></h1>';	
+
+		if(trim($item->getAuthor()) == ''){
+			$from = $l->t('from') . ' ' . parse_url($item->getUrl(), PHP_URL_HOST);
+		} else {
+			$from = $l->t('from') . ' ' . $item->getAuthor();
+		}
+		echo '<h2 class="item_author">' . $from . '</h2>';
+
 		echo '<div class="body">' . $item->getBody() . '</div>';
 
 	echo '</li>';