aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-04-10 20:09:51 -0700
committerfriendica <info@friendica.com>2012-04-10 20:09:51 -0700
commit0fa932853c76d8aca9fecf125d4c2d6816fb1a4a (patch)
tree5eefd6809fdd275b9f4ee31690815271bd69fa13 /mod
parent640f258f187674e037655ee461ea483c7c92ef23 (diff)
downloadvolse-hubzilla-0fa932853c76d8aca9fecf125d4c2d6816fb1a4a.tar.gz
volse-hubzilla-0fa932853c76d8aca9fecf125d4c2d6816fb1a4a.tar.bz2
volse-hubzilla-0fa932853c76d8aca9fecf125d4c2d6816fb1a4a.zip
profile redir - goto correct profile page even if contact blocked, you just can't do anything.
Diffstat (limited to 'mod')
-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':