harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

unbreak some more stuff

Browse Source
This commit is contained in:
friendica
2012-09-04 19:49:29 -07:00
parent 576559fd02
commit a08666be14
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
boot.php
View File

@@ -1064,7 +1064,7 @@ function profile_load(&$a, $nickname, $profile = 0) {
}
$r = null;
if($profile) {
$profile_int = intval($profile);
$r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar_date` AS picdate, entity.* FROM `profile`
@@ -1074,7 +1074,7 @@ function profile_load(&$a, $nickname, $profile = 0) {
intval($profile_int)
);
}
if((! $r) && (! count($r))) {
if(! ($r && count($r))) {
$r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar_date` AS picdate, `entity`.* FROM `profile`
left join `contact` on `contact`.`uid` = `profile`.`uid` LEFT JOIN `entity` ON `profile`.`uid` = entity.entity_id
WHERE entity.entity_address = '%s' AND `profile`.`is_default` = 1 and `contact`.`self` = 1 LIMIT 1",
@@ -1082,7 +1082,7 @@ function profile_load(&$a, $nickname, $profile = 0) {
);
}
if(($r === false) || (! count($r))) {
if(! ($r && count($r))) {
logger('profile error: ' . $a->query_string, LOGGER_DEBUG);
notice( t('Requested profile is not available.') . EOL );
$a->error = 404;