From e6364f6680e2abcffd3311ba189f17ceef08b9f5 Mon Sep 17 00:00:00 2001 From: Beanow Date: Sat, 28 Jun 2014 01:30:10 +0200 Subject: [PATCH] Redirect profiles list to default profile, when multi_profiles is disabled. --- mod/profiles.php | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/mod/profiles.php b/mod/profiles.php index e57a0fa841..c47d9ad515 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -726,12 +726,26 @@ function profiles_content(&$a) { return $o; } + + //Profiles list. else { - + + //If we don't support multi profiles, don't display this list. + if(!feature_enabled(local_user(),'multi_profiles')){ + $r = q( + "SELECT * FROM `profile` WHERE `uid` = %d AND `is-default`=1", + local_user() + ); + if(count($r)){ + //Go to the default profile. + goaway($a->get_baseurl(true) . '/profiles/'.$r[0]['id']); + } + } + $r = q("SELECT * FROM `profile` WHERE `uid` = %d", local_user()); if(count($r)) { - + $tpl_header = get_markup_template('profile_listing_header.tpl'); $o .= replace_macros($tpl_header,array( '$header' => t('Edit/Manage Profiles'), @@ -739,10 +753,10 @@ function profiles_content(&$a) { '$cr_new' => t('Create New Profile'), '$cr_new_link' => 'profiles/new?t=' . get_form_security_token("profile_new") )); - - + + $tpl = get_markup_template('profile_entry.tpl'); - + foreach($r as $rr) { $o .= replace_macros($tpl, array( '$photo' => $a->get_cached_avatar_image($rr['thumb']),