diff options
author | friendica <info@friendica.com> | 2012-04-13 06:02:18 -0700 |
---|---|---|
committer | friendica <info@friendica.com> | 2012-04-13 06:02:18 -0700 |
commit | 11ba88b6d21a40c302d21646dfa9366bb393931d (patch) | |
tree | feddc7956054f7966e2f4ebd4231df20e9e31fee /view/theme/quattro/conversation.tpl | |
parent | df1904b204a969780609cac64bbb1a03a8dd3fcb (diff) | |
parent | f6e1ddf7fbcc122f5122336650e1cfaa71aed8e3 (diff) | |
download | volse-hubzilla-11ba88b6d21a40c302d21646dfa9366bb393931d.tar.gz volse-hubzilla-11ba88b6d21a40c302d21646dfa9366bb393931d.tar.bz2 volse-hubzilla-11ba88b6d21a40c302d21646dfa9366bb393931d.zip |
Merge pull request #230 from fabrixxm/master
some work, mainly on quattro
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> |