aboutsummaryrefslogtreecommitdiffstats
path: root/mod/dfrn_poll.php
diff options
context:
space:
mode:
authorMichael Vogel <icarus@dabo.de>2012-04-11 19:35:51 +0200
committerMichael Vogel <icarus@dabo.de>2012-04-11 19:35:51 +0200
commitee714daf4d33f8258e1301438423fc10a3bdc916 (patch)
treee3da18226db88c42819e2f29b67763581eb1c293 /mod/dfrn_poll.php
parentc88c2515e43f7a446a9b358fb657290a8a6c847a (diff)
parenta1d5026abf129fc520327881a293d17c1ab21eff (diff)
downloadvolse-hubzilla-ee714daf4d33f8258e1301438423fc10a3bdc916.tar.gz
volse-hubzilla-ee714daf4d33f8258e1301438423fc10a3bdc916.tar.bz2
volse-hubzilla-ee714daf4d33f8258e1301438423fc10a3bdc916.zip
Merge commit 'upstream/master'
Diffstat (limited to 'mod/dfrn_poll.php')
-rw-r--r--mod/dfrn_poll.php6
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':