Merge pull request #646 from annando/master

[friendica.git] / view / wall_thread.tpl

diff --git a/view/wall_thread.tpl b/view/wall_thread.tpl
index bcb74ec7045033953d0735f50535dee3d80b0a1c..716956c65569901e66485cb0d6acfa3645dd5a73 100644 (file)
--- a/view/wall_thread.tpl
+++ b/view/wall_thread.tpl
@@ -50,12 +50,12 @@
                                                {{ endfor }}
                                        </div>
                        {{ if $item.has_cats }}
-                       <div class="categorytags"><span>$item.txt_cats {{ for $item.categories as $cat }}$cat.name <a href="$cat.removeurl" title="$remove">[$remove]</a> {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
+                       <div class="categorytags"><span>$item.txt_cats {{ for $item.categories as $cat }}$cat.name{{ if $cat.removeurl }} <a href="$cat.removeurl" title="$remove">[$remove]</a>{{ endif }} {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
                        </div>
                        {{ endif }}
 
                        {{ if $item.has_folders }}
-                       <div class="filesavetags"><span>$item.txt_folders {{ for $item.folders as $cat }}$cat.name <a href="$cat.removeurl" title="$remove">[$remove]</a> {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
+                       <div class="filesavetags"><span>$item.txt_folders {{ for $item.folders as $cat }}$cat.name{{ if $cat.removeurl}} <a href="$cat.removeurl" title="$remove">[$remove]</a>{{ endif }}{{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
                        </div>
                        {{ endif }}
                        </div>
@@ -107,8 +107,8 @@
 
 <div class="wall-item-outside-wrapper-end $item.indent" ></div>
 </div>
-{{ for $item.children as $item }}
-       {{ inc $item.template }}{{ endinc }}
+{{ for $item.children as $child }}
+       {{ inc $child.template with $item=$child }}{{ endinc }}
 {{ endfor }}
 
 {{ if $item.flatten }}