profile redir - goto correct profile page even if contact blocked, you just can't do anything.
This commit is contained in:
parent
640f258f18
commit
0fa932853c
1 changed files with 4 additions and 2 deletions
|
@ -428,11 +428,13 @@ function dfrn_poll_content(&$a) {
|
||||||
break; // NOTREACHED
|
break; // NOTREACHED
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$nickname = $a->argv[1];
|
||||||
|
|
||||||
$r = q("SELECT `contact`.*, `user`.`username`, `user`.`nickname`
|
$r = q("SELECT `contact`.*, `user`.`username`, `user`.`nickname`
|
||||||
FROM `contact` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid`
|
FROM `contact` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid`
|
||||||
WHERE `contact`.`blocked` = 0 AND `contact`.`pending` = 0
|
WHERE `contact`.`blocked` = 0 AND `contact`.`pending` = 0
|
||||||
AND `user`.`nickname` = '%s' $sql_extra LIMIT 1",
|
AND `user`.`nickname` = '%s' $sql_extra LIMIT 1",
|
||||||
dbesc($a->argv[1])
|
dbesc($nickname)
|
||||||
);
|
);
|
||||||
|
|
||||||
if(count($r)) {
|
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) {
|
switch($destination_url) {
|
||||||
case 'profile':
|
case 'profile':
|
||||||
|
|
Loading…
Reference in a new issue