diff --git a/addressbook/inc/class.contacts_shared.inc.php b/addressbook/inc/class.contacts_shared.inc.php
index 3834be1ded..94f32e3b07 100644
--- a/addressbook/inc/class.contacts_shared.inc.php
+++ b/addressbook/inc/class.contacts_shared.inc.php
@@ -174,40 +174,27 @@
$match = 0;
if($DEBUG) { echo "
"; }
for($i=0;$i"; }
$new_ldap[] = $ldap_fields[$i];
diff --git a/addressbook/index.php b/addressbook/index.php
index ad3a37196e..fc057188cf 100755
--- a/addressbook/index.php
+++ b/addressbook/index.php
@@ -109,19 +109,19 @@
if (!$filter) { $filter = "none"; }
if ($filter == "none") {
- if ($cat_id == "all") {
+ if (!$cat_id) {
$qfilter = 'tid=n';
} else {
$qfilter = 'tid=n,cat_id='.$cat_id;
}
} elseif($filter == "private") {
- if ($cat_id == "all") {
+ if (!$cat_id) {
$qfilter = 'tid=n,access=private,owner='.$phpgw_info["user"]["account_id"];
} else {
$qfilter = 'tid=n,access=private,owner='.$phpgw_info["user"]["account_id"].',cat_id='.$cat_id;
}
} else {
- if ($cat_id == "all") {
+ if (!$cat_id) {
$qfilter = 'tid=n,owner='.$filter;
} else {
$qfilter = 'tid=n,owner='.$filter.'cat_id='.$cat_id;