Merge https://github.com/friendica/friendica into pull

[friendica.git] / boot.php

diff --git a/boot.php b/boot.php
index cfe8cbcbd3dd80cf6385713318ea5dc122042b7f..b83fe32a1ecb3c170a2758f9ad62d3c15e0a7f97 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -9,6 +9,7 @@ require_once('include/pgettext.php');
 require_once('include/nav.php');
 require_once('include/cache.php');
 require_once('library/Mobile_Detect/Mobile_Detect.php');
+require_once('include/features.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
 define ( 'FRIENDICA_VERSION',      '3.0.1535' );
@@ -359,6 +360,7 @@ if(! class_exists('App')) {
 
                public $category;
 
+
                // Allow themes to control internal parameters
                // by changing App values in theme.php
 
@@ -1232,7 +1234,7 @@ if(! function_exists('profile_sidebar')) {
 
 
                // show edit profile to yourself
-               if ($profile['uid'] == local_user()) {
+               if ($profile['uid'] == local_user() && feature_enabled(local_user(),'multi_profiles')) {
                        $profile['edit'] = array($a->get_baseurl(). '/profiles', t('Profiles'),"", t('Manage/edit profiles'));
                
                        $r = q("SELECT * FROM `profile` WHERE `uid` = %d",