Skip to content

Commit 314d9c1

Browse files
authored
Merge pull request #1001 from annando/notice
Forumdirectory: Fix Notice "Undefined index: url in src/Module/Directory.php"
2 parents bddb826 + cae25f1 commit 314d9c1

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

forumdirectory/forumdirectory.php

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
use Friendica\Database\DBA;
1616
use Friendica\DI;
1717
use Friendica\Model\Profile;
18+
use Friendica\Model\User;
1819
use Friendica\Util\Strings;
1920

2021
function forumdirectory_install()
@@ -93,8 +94,9 @@ function forumdirectory_content(App $a)
9394

9495
$total = 0;
9596
$cnt = DBA::fetchFirst("SELECT COUNT(*) AS `total` FROM `profile`
96-
LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid`
97-
WHERE $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed` `user`.`page-flags` = 2 $sql_extra");
97+
INNER JOIN `user` ON `user`.`uid` = `profile`.`uid`
98+
WHERE $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed` `user`.`page-flags` = ? $sql_extra",
99+
User::PAGE_FLAGS_COMMUNITY);
98100
if (DBA::isResult($cnt)) {
99101
$total = $cnt['total'];
100102
}
@@ -106,11 +108,11 @@ function forumdirectory_content(App $a)
106108
$limit = $pager->getStart()."," . $pager->getItemsPerPage();
107109

108110
$r = DBA::p("SELECT `profile`.*, `user`.`nickname`, `user`.`timezone` , `user`.`page-flags`,
109-
`contact`.`addr`, `contact`.`url` AS `profile_url` FROM `profile`
110-
LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid`
111-
LEFT JOIN `contact` ON `contact`.`uid` = `user`.`uid`
112-
WHERE $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed` AND `user`.`page-flags` = 2 AND `contact`.`self`
113-
$sql_extra $order LIMIT $limit"
111+
`contact`.`addr`, `contact`.`url` FROM `profile`
112+
INNER JOIN `user` ON `user`.`uid` = `profile`.`uid`
113+
INNER JOIN `contact` ON `contact`.`uid` = `user`.`uid`
114+
WHERE $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed` AND `user`.`page-flags` = ? AND `contact`.`self`
115+
$sql_extra $order LIMIT $limit", User::PAGE_FLAGS_COMMUNITY
114116
);
115117

116118
if (DBA::isResult($r)) {

0 commit comments

Comments
 (0)