Merge pull request #4962 from astifter/fix_cropped_find_button

[friendica.git] / src / Model / Profile.php

diff --git a/src/Model/Profile.php b/src/Model/Profile.php
index cd8fa29e136ca208176287835f9fd2895acd6e9b..8bb519448e32d18a2fd179f7fe881b0668ab86c4 100644 (file)
--- a/src/Model/Profile.php
+++ b/src/Model/Profile.php
@@ -92,14 +92,14 @@ class Profile
        {
                $user = dba::selectFirst('user', ['uid'], ['nickname' => $nickname]);
 
-               if (!$user && !count($user) && !count($profiledata)) {
+               if (!DBM::is_result($user) && empty($profiledata)) {
                        logger('profile error: ' . $a->query_string, LOGGER_DEBUG);
                        notice(L10n::t('Requested account is not available.') . EOL);
                        $a->error = 404;
                        return;
                }
 
-               if (!x($a->page, 'aside')) {
+               if (empty($a->page['aside'])) {
                        $a->page['aside'] = '';
                }
 
@@ -152,15 +152,11 @@ class Profile
 
                $a->set_template_engine(); // reset the template engine to the default in case the user's theme doesn't specify one
 
-               $theme_info_file = 'view/theme/' . current_theme() . '/theme.php';
+               $theme_info_file = 'view/theme/' . $a->getCurrentTheme() . '/theme.php';
                if (file_exists($theme_info_file)) {
                        require_once $theme_info_file;
                }
 
-               if (!x($a->page, 'aside')) {
-                       $a->page['aside'] = '';
-               }
-
                if (local_user() && local_user() == $a->profile['uid'] && $profiledata) {
                        $a->page['aside'] .= replace_macros(
                                get_markup_template('profile_edlink.tpl'),
@@ -954,7 +950,7 @@ class Profile
                        ];
                }
 
-               if ((!$is_owner) && ((count($a->profile)) || (!$a->profile['hide-friends']))) {
+               if (!$is_owner && empty($a->profile['hide-friends'])) {
                        $tabs[] = [
                                'label' => L10n::t('Contacts'),
                                'url'   => System::baseUrl() . '/viewcontacts/' . $nickname,