aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-09-04 19:49:29 -0700
committerfriendica <info@friendica.com>2012-09-04 19:49:29 -0700
commita08666be142c484134c2f10cf0c460c8a3c07682 (patch)
tree68a730081f8d0fcacf966a5d088c4180e67b344a /boot.php
parent576559fd02bb12cbba53c11cec4a89f70ff7a132 (diff)
downloadvolse-hubzilla-a08666be142c484134c2f10cf0c460c8a3c07682.tar.gz
volse-hubzilla-a08666be142c484134c2f10cf0c460c8a3c07682.tar.bz2
volse-hubzilla-a08666be142c484134c2f10cf0c460c8a3c07682.zip
unbreak some more stuff
Diffstat (limited to 'boot.php')
-rw-r--r--boot.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/boot.php b/boot.php
index 6bc21033b..15eaf7970 100644
--- a/boot.php
+++ b/boot.php
@@ -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;