clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Some small code adjustments

This commit is contained in:
Michael 2019-09-29 19:21:05 +00:00
parent 5eeca432fe
commit 520c250a41
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Model/Profile.php
View File

@ -1186,7 +1186,7 @@ class Profile
if (!strlen($s)) { if (!strlen($s)) {
return $s; return $s;
} }
if ((!strpos($s, '/profile/')) && (!$force)) { if (!strpos($s, '/profile/') && !$force) {
return $s; return $s;
} }
if ($force && substr($s, -1, 1) !== '/') { if ($force && substr($s, -1, 1) !== '/') {
@ -1243,7 +1243,7 @@ class Profile
if (!empty($search)) { if (!empty($search)) {
$searchTerm = '%' . $search . '%'; $searchTerm = '%' . $search . '%';
$cnt = DBA::fetchFirst("SELECT COUNT(*) AS `total` $cnt = DBA::fetchFirst("SELECT COUNT(*) AS `total`
FROM `profile` FROM `profile`
LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid`
WHERE `is-default` $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed` WHERE `is-default` $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed`
@ -1265,7 +1265,7 @@ class Profile
$searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm,
$searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm); $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm);
} else { } else {
$cnt = DBA::fetchFirst("SELECT COUNT(*) AS `total` $cnt = DBA::fetchFirst("SELECT COUNT(*) AS `total`
FROM `profile` FROM `profile`
LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid`
WHERE `is-default` $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed`"); WHERE `is-default` $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed`");