diff options
| author | friendica <info@friendica.com> | 2011-12-18 12:51:45 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2011-12-18 12:51:45 -0800 |
| commit | eb05d00794055dcd895ff9c3f73c55d7d7a13d10 (patch) | |
| tree | be12d28e916eb2d5d3961fa6d26cbded0cf22d38 | |
| parent | 622886a33c459e5290bdfcf491a1c8f9ed132207 (diff) | |
| download | volse-hubzilla-eb05d00794055dcd895ff9c3f73c55d7d7a13d10.tar.gz volse-hubzilla-eb05d00794055dcd895ff9c3f73c55d7d7a13d10.tar.bz2 volse-hubzilla-eb05d00794055dcd895ff9c3f73c55d7d7a13d10.zip | |
connect on suggest/match - added to testbubble
| -rw-r--r-- | mod/follow.php | 8 | ||||
| -rw-r--r-- | mod/match.php | 1 | ||||
| -rw-r--r-- | view/theme/testbubble/match.tpl | 5 |
3 files changed, 13 insertions, 1 deletions
diff --git a/mod/follow.php b/mod/follow.php index f99d91757..f8964885e 100644 --- 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 9324624c8..3645a419d 100644 --- 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 49c3c81e4..244b243ec 100644 --- 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 |