diff options
| author | Michael <icarus@dabo.de> | 2012-04-11 18:48:58 +0200 |
|---|---|---|
| committer | Michael <icarus@dabo.de> | 2012-04-11 18:48:58 +0200 |
| commit | 39405c8056b4a1d55c97fb2963d8776695dbeb30 (patch) | |
| tree | c9f89ba0e9aacee343cf50b6b8a64468bb8db694 /mod/dfrn_poll.php | |
| parent | c3139fa0fd49b0b4de4568d46a6946c75ccb2a62 (diff) | |
| parent | cdb6510b9f3007d2afd3081313caa7d045af1e7c (diff) | |
| download | volse-hubzilla-39405c8056b4a1d55c97fb2963d8776695dbeb30.tar.gz volse-hubzilla-39405c8056b4a1d55c97fb2963d8776695dbeb30.tar.bz2 volse-hubzilla-39405c8056b4a1d55c97fb2963d8776695dbeb30.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'mod/dfrn_poll.php')
| -rw-r--r-- | mod/dfrn_poll.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php index 5c2788983..436727a78 100644 --- a/mod/dfrn_poll.php +++ b/mod/dfrn_poll.php @@ -428,11 +428,13 @@ function dfrn_poll_content(&$a) { break; // NOTREACHED } + $nickname = $a->argv[1]; + $r = q("SELECT `contact`.*, `user`.`username`, `user`.`nickname` FROM `contact` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid` WHERE `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `user`.`nickname` = '%s' $sql_extra LIMIT 1", - dbesc($a->argv[1]) + dbesc($nickname) ); if(count($r)) { @@ -482,7 +484,7 @@ function dfrn_poll_content(&$a) { )); } - $profile = $r[0]['nickname']; + $profile = ((count($r) && $r[0]['nickname']) ? $r[0]['nickname'] : $nickname); switch($destination_url) { case 'profile': |