Merge pull request #9177 from MrPetovan/bug/frio-light-dark-schemes-fix

[friendica.git] / mod / settings.php

diff --git a/mod/settings.php b/mod/settings.php
index d02375ed7c657ee5b30fad15b44039d9ed19ff86..39667af92fffc8d0ebdf52677a15a4eff1047af3 100644 (file)
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -31,7 +31,6 @@ use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
-use Friendica\Model\GContact;
 use Friendica\Model\Group;
 use Friendica\Model\Notify\Type;
 use Friendica\Model\User;
@@ -471,9 +470,6 @@ function settings_post(App $a)
 
        Worker::add(PRIORITY_LOW, 'ProfileUpdate', local_user());
 
-       // Update the global contact for the user
-       GContact::updateForUser(local_user());
-
        DI::baseUrl()->redirect('settings');
        return; // NOTREACHED
 }
@@ -870,7 +866,7 @@ function settings_content(App $a)
                '$password1'=> ['password', DI::l10n()->t('New Password:'), '', DI::l10n()->t('Allowed characters are a-z, A-Z, 0-9 and special characters except white spaces, accentuated letters and colon (:).')],
                '$password2'=> ['confirm', DI::l10n()->t('Confirm:'), '', DI::l10n()->t('Leave password fields blank unless changing')],
                '$password3'=> ['opassword', DI::l10n()->t('Current Password:'), '', DI::l10n()->t('Your current password to confirm the changes')],
-               '$password4'=> ['mpassword', DI::l10n()->t('Password:'), '', DI::l10n()->t('Your current password to confirm the changes')],
+               '$password4'=> ['mpassword', DI::l10n()->t('Password:'), '', DI::l10n()->t('Your current password to confirm the changes of the email address')],
                '$oid_enable' => (!DI::config()->get('system', 'no_openid')),
                '$openid'       => $openid_field,
                '$delete_openid' => ['delete_openid', DI::l10n()->t('Delete OpenID URL'), false, ''],