Skip to content

Commit

Permalink
370: solving #11225 merge regression (#12238)
Browse files Browse the repository at this point in the history
  • Loading branch information
@infograf768 @rdeutz
infograf768 authored and rdeutz committed Oct 2, 2016
1 parent 6c66bd1 commit cb86b89
Showing 1 changed file with 20 additions and 22 deletions.
42 changes: 20 additions & 22 deletions components/com_content/views/category/tmpl/default_articles.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@
<td <?php echo $headerAuthor; ?> class="list-author">
<?php if (!empty($article->author) || !empty($article->created_by_alias)) : ?>
<?php $author = $article->author ?>
<?php $author = ($article->created_by_alias ? $article->created_by_alias : $author);?>
<?php $author = ($article->created_by_alias ? $article->created_by_alias : $author); ?>
<?php if (!empty($article->contact_link) && $this->params->get('link_author') == true) : ?>
<?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', JHtml::_('link', $article->contact_link, $author)); ?>
<?php else: ?>
Expand All @@ -230,27 +230,25 @@
<?php echo JText::sprintf('JGLOBAL_HITS_COUNT', $article->hits); ?>
</span>
</td>
<?php endif; ?>
<?php if (($this->params->get('list_show_votes', 0)) && ($this->vote)) : ?>
<td <?php echo $headerVotes; ?> class="list-votes">
<span class="badge badge-success">
<?php echo JText::sprintf('COM_CONTENT_VOTES_COUNT', $article->rating_count); ?>
</span>
</td>
<?php endif; ?>
<?php if (($this->params->get('list_show_ratings', 0)) && ($this->vote)) : ?>
<td <?php echo $headerRatings; ?> class="list-ratings">
<span class="badge badge-warning">
<?php echo JText::sprintf('COM_CONTENT_RATINGS_COUNT', $article->rating); ?>
</span>
</td>
<?php endif; ?>
<?php if ($isEditable) : ?>
<td <?php echo $headerEdit; ?> class="list-edit">
<?php if ($article->params->get('access-edit')) : ?>
<?php echo JHtml::_('icon.edit', $article, $params); ?>
<?php endif; ?>
</td>
<?php endif; ?>
<?php if (($this->params->get('list_show_votes', 0)) && ($this->vote)) : ?>
<td <?php echo $headerVotes; ?> class="list-votes">
<span class="badge badge-success">
<?php echo JText::sprintf('COM_CONTENT_VOTES_COUNT', $article->rating_count); ?>
</span>
</td>
<?php endif; ?>
<?php if (($this->params->get('list_show_ratings', 0)) && ($this->vote)) : ?>
<td <?php echo $headerRatings; ?> class="list-ratings">
<span class="badge badge-warning">
<?php echo JText::sprintf('COM_CONTENT_RATINGS_COUNT', $article->rating); ?>
</span>
</td>
<?php endif; ?>
<?php if ($isEditable) : ?>
<td <?php echo $headerEdit; ?> class="list-edit">
<?php if ($article->params->get('access-edit')) : ?>
<?php echo JHtml::_('icon.edit', $article, $params); ?>
<?php endif; ?>
</td>
<?php endif; ?>
Expand Down

0 comments on commit cb86b89

Please sign in to comment.