diff options
| author | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2012-03-14 07:20:13 +0100 |
|---|---|---|
| committer | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2012-03-14 07:20:13 +0100 |
| commit | 4fcdada4320d5d5619eb3a1f517d0fea6b26857b (patch) | |
| tree | bc2ba3aac0a08c1464718f688be8080d0dff6d2c /mod/contacts.php | |
| parent | 5bae7159cc7b182e40229bb6d547ccf303eb4282 (diff) | |
| parent | fb77bfa648c3dd06d1b3f343f5ad98f32a7ce313 (diff) | |
| download | volse-hubzilla-4fcdada4320d5d5619eb3a1f517d0fea6b26857b.tar.gz volse-hubzilla-4fcdada4320d5d5619eb3a1f517d0fea6b26857b.tar.bz2 volse-hubzilla-4fcdada4320d5d5619eb3a1f517d0fea6b26857b.zip | |
Merge branch 'master' of https://github.com/friendica/friendica
Diffstat (limited to 'mod/contacts.php')
| -rwxr-xr-x | mod/contacts.php | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/mod/contacts.php b/mod/contacts.php index 001bf12af..38ca570dd 100755 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -445,7 +445,7 @@ function contacts_content(&$a) { $r = q("SELECT COUNT(*) AS `total` FROM `contact` - WHERE `uid` = %d AND `pending` = 0 $sql_extra $sql_extra2 ", + WHERE `uid` = %d AND `self` = 0 AND `pending` = 0 $sql_extra $sql_extra2 ", intval($_SESSION['uid'])); if(count($r)) { $a->set_pager_total($r[0]['total']); @@ -454,7 +454,7 @@ function contacts_content(&$a) { - $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `pending` = 0 $sql_extra $sql_extra2 ORDER BY `name` ASC LIMIT %d , %d ", + $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `pending` = 0 $sql_extra $sql_extra2 ORDER BY `name` ASC LIMIT %d , %d ", intval($_SESSION['uid']), intval($a->pager['start']), intval($a->pager['itemspage']) @@ -465,8 +465,6 @@ function contacts_content(&$a) { if(count($r)) { foreach($r as $rr) { - if($rr['self']) - continue; switch($rr['rel']) { case CONTACT_IS_FRIEND: |