aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mod/connections.php2
-rw-r--r--view/theme/redbasic/css/style.css2
2 files changed, 2 insertions, 2 deletions
diff --git a/mod/connections.php b/mod/connections.php
index b9605da01..3c3a704b2 100644
--- a/mod/connections.php
+++ b/mod/connections.php
@@ -213,7 +213,7 @@ function connections_content(&$a) {
nav_set_selected('intros');
break;
case 'ifpending':
- $r = q("SELECT COUNT(abook.abook_id) AS total FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash where abook_channel = %d and (abook_flags & %d) and not (abook_flags & %d) and not (xchan_flags & %d )",
+ $r = q("SELECT COUNT(abook.abook_id) AS total FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash where abook_channel = %d and (abook_flags & %d) and not ((abook_flags & %d) or (xchan_flags & %d))",
intval(local_user()),
intval(ABOOK_FLAG_PENDING),
intval(ABOOK_FLAG_SELF|ABOOK_FLAG_IGNORED),
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index bc1dd9c74..a4373ed37 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1467,7 +1467,7 @@ div.jGrowl div.jGrowl-notification {
.autocomplete {
color: $font_colour;
- background: #FFF;
+ background: $dropdown_bgcolour;
cursor: pointer;
text-align: left;
max-height: 350px;