diff options
| author | Michael <icarus@dabo.de> | 2012-04-14 13:03:40 +0200 |
|---|---|---|
| committer | Michael <icarus@dabo.de> | 2012-04-14 13:03:40 +0200 |
| commit | 188829ed46be6d3c7a91380226e26e8292c327be (patch) | |
| tree | 2fb4148bc2222cf198309f4025862080c89fe36b /view/theme/quattro/conversation.tpl | |
| parent | 7384786d4417ddd051b7daa71c019d3c551efc68 (diff) | |
| parent | 0d869ceb65badbd4d80dd0d5cf2d631bca7f5b9e (diff) | |
| download | volse-hubzilla-188829ed46be6d3c7a91380226e26e8292c327be.tar.gz volse-hubzilla-188829ed46be6d3c7a91380226e26e8292c327be.tar.bz2 volse-hubzilla-188829ed46be6d3c7a91380226e26e8292c327be.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'view/theme/quattro/conversation.tpl')
| -rw-r--r-- | view/theme/quattro/conversation.tpl | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/view/theme/quattro/conversation.tpl b/view/theme/quattro/conversation.tpl index ff202bbe4..7bb7cd2fd 100644 --- a/view/theme/quattro/conversation.tpl +++ b/view/theme/quattro/conversation.tpl @@ -9,8 +9,11 @@ {{endif}} {{if $item.comment_lastcollapsed}}</div>{{endif}} - {{ inc $item.template }}{{ endinc }} - + {{ if $item.type == tag }} + {{ inc wall_item_tag.tpl }}{{ endinc }} + {{ else }} + {{ inc $item.template }}{{ endinc }} + {{ endif }} {{ endfor }} </div> |