Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

[friendica.git] / view / theme / testbubble / match.tpl

diff --git a/view/theme/testbubble/match.tpl b/view/theme/testbubble/match.tpl
old mode 100644 (file)
new mode 100755 (executable)
index 49c3c81..244b243
--- a/view/theme/testbubble/match.tpl
+++ b/view/theme/testbubble/match.tpl
@@ -4,7 +4,10 @@
                        <img src="$photo" alt="$name" />
                </a>
        </div>
-       <span><a href="$url">$name</a> is interested in:<br />$tags</span>
+       <span><a href="$url">$name</a>$inttxt<br />$tags</span>
        <div class="profile-match-break"></div>
+       {{ if $connlnk }}
+       <div class="profile-match-connect"><a href="$connlnk" title="$conntxt">$conntxt</a></div>
+       {{ endif }}
        <div class="profile-match-end"></div>
 </div>
\ No newline at end of file