diff options
| author | friendica <info@friendica.com> | 2013-02-13 04:12:13 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-02-13 04:12:13 -0800 |
| commit | b19764c9a1842cc366ffb641984395210e92c2b1 (patch) | |
| tree | fe7a4325142051a9f7e54cbef3a61c2841e7ca93 | |
| parent | c769c2e79f4209bb745e51733aba8668cd1f9ede (diff) | |
| download | volse-hubzilla-b19764c9a1842cc366ffb641984395210e92c2b1.tar.gz volse-hubzilla-b19764c9a1842cc366ffb641984395210e92c2b1.tar.bz2 volse-hubzilla-b19764c9a1842cc366ffb641984395210e92c2b1.zip | |
fix to common friends - it seems it counts the right number of common friends, but they are all you
| -rw-r--r-- | include/contact_widgets.php | 2 | ||||
| -rw-r--r-- | include/socgraph.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/contact_widgets.php b/include/contact_widgets.php index 1a52668b0..54e2ad967 100644 --- a/include/contact_widgets.php +++ b/include/contact_widgets.php @@ -118,7 +118,7 @@ function common_friends_visitor_widget($profile_uid) { $r = common_friends($profile_uid,$observer_hash,0,5,true); return replace_macros(get_markup_template('remote_friends_common.tpl'), array( - '$desc' => sprintf( tt("%d contact in common", "%d contacts in common", $t), $t), + '$desc' => sprintf( tt("%d connection in common", "%d connections in common", $t), $t), '$base' => $a->get_baseurl(), '$uid' => $profile_uid, '$cid' => $observer, diff --git a/include/socgraph.php b/include/socgraph.php index 7e2d65bb4..f6be92657 100644 --- a/include/socgraph.php +++ b/include/socgraph.php @@ -165,7 +165,7 @@ function common_friends($uid,$xchan,$start = 0,$limit=100000000,$shuffle = false else $sql_extra = " order by xchan_name asc "; - $r = q("SELECT * from xchan left join xlink on xlink_xchan = xchan_hash where xlink_xchan = '%s' and xlink_link in + $r = q("SELECT * from xchan left join xlink on xlink_link = xchan_hash where xlink_xchan = '%s' and xlink_link in (select abook_xchan from abook where abook_xchan != '%s' and abook_channel = %d and abook_flags = 0 ) $sql_extra limit %d, %d", dbesc($xchan), dbesc($xchan), |