aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorRedMatrix <info@friendica.com>2014-12-31 10:22:30 +1100
committerRedMatrix <info@friendica.com>2014-12-31 10:22:30 +1100
commit009b05b3b6013a6f999e5b493df1cadc1dafb537 (patch)
treead024727f7d15e14e888153e0620d52f76596e25 /include
parentb7d758fed02913c6b108802077b64cf99c95c908 (diff)
parent2444a3f9d9eb3ec45b5a5d337f4a23e0c5a96774 (diff)
downloadvolse-hubzilla-009b05b3b6013a6f999e5b493df1cadc1dafb537.tar.gz
volse-hubzilla-009b05b3b6013a6f999e5b493df1cadc1dafb537.tar.bz2
volse-hubzilla-009b05b3b6013a6f999e5b493df1cadc1dafb537.zip
Merge pull request #796 from pafcu/profeditfix
Don't show links to edit alternate profiles if multi_profiles is disable...
Diffstat (limited to 'include')
-rw-r--r--include/identity.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/include/identity.php b/include/identity.php
index 7ae8e48f6..17238ea99 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -856,7 +856,8 @@ function profile_sidebar($profile, $block = 0, $show_connect = true) {
);
- if(feature_enabled(local_user(),'multi_profiles')) {
+ $multi_profiles = feature_enabled(local_user(), 'multi_profiles');
+ if($multi_profiles) {
$profile['edit'] = array($a->get_baseurl(). '/profiles', t('Profiles'),"", t('Manage/edit profiles'));
$profile['menu']['cr_new'] = t('Create New Profile');
}
@@ -869,6 +870,8 @@ function profile_sidebar($profile, $block = 0, $show_connect = true) {
if($r) {
foreach($r as $rr) {
+ if(!($multi_profiles || $rr['is_default']))
+ continue;
$profile['menu']['entries'][] = array(
'photo' => $rr['thumb'],
'id' => $rr['id'],