Merge pull request #8191 from MrPetovan/task/7967-mastodon-api-custom_emojis

[friendica.git] / mod / settings.php

diff --git a/mod/settings.php b/mod/settings.php
index 85fc6e1b80def61329532e2dd47dea06f8764cb4..3ba5dc2b370ab09cbf6d4110035f80f11319ce75 100644 (file)
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -8,7 +8,6 @@ use Friendica\BaseModule;
 use Friendica\Content\Feature;
 use Friendica\Content\Nav;
 use Friendica\Core\ACL;
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
@@ -74,9 +73,9 @@ function settings_init(App $a)
        ];
 
        $tabs[] =       [
-               'label' => DI::l10n()->t('Profiles'),
-               'url'   => 'profiles',
-               'selected'      => (($a->argc == 1) && ($a->argv[0] === 'profiles')?'active':''),
+               'label' => DI::l10n()->t('Profile'),
+               'url'   => 'settings/profile',
+               'selected'      => (($a->argc > 1) && ($a->argv[1] === 'profile')?'active':''),
                'accesskey' => 'p',
        ];
 
@@ -612,7 +611,7 @@ function settings_post(App $a)
                `name` = '%s',
                `net-publish` = %d,
                `hide-friends` = %d
-               WHERE `is-default` = 1 AND `uid` = %d",
+               WHERE `uid` = %d",
                intval($publish),
                DBA::escape($username),
                intval($net_publish),
@@ -979,7 +978,7 @@ function settings_content(App $a)
         * ACCOUNT SETTINGS
         */
 
-       $profile = DBA::selectFirst('profile', [], ['is-default' => true, 'uid' => local_user()]);
+       $profile = DBA::selectFirst('profile', [], ['uid' => local_user()]);
        if (!DBA::isResult($profile)) {
                notice(DI::l10n()->t('Unable to find your profile. Please contact your admin.') . EOL);
                return;