aboutsummaryrefslogtreecommitdiffstats
path: root/mod/dfrn_poll.php
diff options
context:
space:
mode:
authorMike Macgirvin <mike@macgirvin.com>2010-10-18 00:43:49 -0700
committerMike Macgirvin <mike@macgirvin.com>2010-10-18 00:43:49 -0700
commit511c761fec572a093e833541968635ca011cb71e (patch)
tree3db5bbc37e47d7bfb7da1086483fff28ca66e147 /mod/dfrn_poll.php
parentbe981a4f8a00fa7fb3e5bf9ac47aa38fd5187a35 (diff)
downloadvolse-hubzilla-511c761fec572a093e833541968635ca011cb71e.tar.gz
volse-hubzilla-511c761fec572a093e833541968635ca011cb71e.tar.bz2
volse-hubzilla-511c761fec572a093e833541968635ca011cb71e.zip
group/community/celebrity pages
Diffstat (limited to 'mod/dfrn_poll.php')
-rw-r--r--mod/dfrn_poll.php7
1 files changed, 5 insertions, 2 deletions
diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php
index fc663f797..84c249a58 100644
--- a/mod/dfrn_poll.php
+++ b/mod/dfrn_poll.php
@@ -38,7 +38,7 @@ function dfrn_poll_init(&$a) {
$sql_extra = '';
switch($direction) {
case (-1):
- $sql_extra = sprintf(" AND `dfrn-id` = '%s' ", dbesc($dfrn_id));
+ $sql_extra = sprintf(" AND ( `dfrn-id` = '%s' OR `issued-id` = '%s' ) ", dbesc($dfrn_id),dbesc($dfrn_id));
$my_id = $dfrn_id;
break;
case 0:
@@ -56,7 +56,10 @@ function dfrn_poll_init(&$a) {
$r = q("SELECT `contact`.*, `user`.`nickname`
FROM `contact` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid`
- WHERE `contact`.`blocked` = 0 AND `contact`.`pending` = 0 $sql_extra LIMIT 1");
+ WHERE `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+ AND `user`.`nickname` = '%s' $sql_extra LIMIT 1",
+ dbesc($a->argv[1])
+ );
if(count($r)) {