diff options
| -rw-r--r-- | db/item.php | 1 | ||||
| -rw-r--r-- | templates/part.items.php | 11 |
2 files changed, 8 insertions, 4 deletions
diff --git a/db/item.php b/db/item.php index 4a3bd9733..e24835226 100644 --- a/db/item.php +++ b/db/item.php @@ -41,7 +41,6 @@ class Item extends Entity { public $enclosureLink; public $feedId; public $status; - public $feedTitle; public $lastModified; diff --git a/templates/part.items.php b/templates/part.items.php index 6ca0a1280..1afc91bb4 100644 --- a/templates/part.items.php +++ b/templates/part.items.php @@ -23,11 +23,16 @@ target="_blank" href="{{item.url}}">{{item.title}}</a> </h1> - <h2 class="item_author">from + <h2 class="item_author"> + <?php p($l->t('from')) ?> <a href="#" ng-click="loadFeed(item.feedId)" - class="from_feed">{{item.feedTitle}}</a> {{item.getAuthorLine()}} - </h2> + class="from_feed">{{ getFeedTitle(item.feedId) }}</a> + <span ui-if="item.author"> + <?php p($l->t('by')) ?> + {{ item.author }} + </span> + </h2> <div class="enclosure" ui-if="item.enclosure"> <audio controls="controls" ng-src="{{item.enclosure.link}}" type="{{item.enclosure.type}}"> |