connect on suggest/match - added to testbubble

diff --git a/mod/follow.php b/mod/follow.php
index f99d91757cc37aebf9cd9955c805110cd0a97ae7..f8964885e187050b34f4a59cf9477eaea20ea238 100644 (file)
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -22,6 +22,14 @@ function follow_init(&$a) {
                // NOTREACHED
        }
 
+
+       if(! $url) {
+               notice( t('Connect URL missing.') . EOL);
+               goaway($_SESSION['return_url']);
+               // NOTREACHED
+       }
+
+
        $ret = probe_url($url);
 
        if($ret['network'] === NETWORK_DFRN) {

diff --git a/mod/match.php b/mod/match.php
index 9324624c840cc37504f17bb607ab87d523389812..3645a419da2a6f8a9f48ae9059fdf25dd921b816 100644 (file)
--- a/mod/match.php
+++ b/mod/match.php
@@ -54,6 +54,7 @@ function match_content(&$a) {
                                        '$url' => $jj->url,
                                        '$name' => $jj->name,
                                        '$photo' => $jj->photo,
+                                       '$inttxt' => ' ' . t('is interested in:'),
                                        '$conntxt' => t('Connect'),
                                        '$connlnk' => $connlnk,
                                        '$tags' => $jj->tags

diff --git a/view/theme/testbubble/match.tpl b/view/theme/testbubble/match.tpl
index 49c3c81e4b64a1bf218ebf684404d7db1ee189cf..244b243ece5f651d64a255018d0c8005cfbf1ea1 100644 (file)
--- 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