From 32c8896a360ec506d21d41d2fe093869ae756525 Mon Sep 17 00:00:00 2001
From: zhujinyong <zhujinyong@easycorp.ltd>
Date: Sat, 7 Oct 2023 00:15:54 +0800
Subject: [PATCH] * Fix bug#39084, #39082.

---
 module/group/lang/resource.php  |  3 ---
 module/group/packagemanager.php | 12 ++----------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php
index 6f2adc61ad..e9f6aeaa27 100644
--- a/module/group/lang/resource.php
+++ b/module/group/lang/resource.php
@@ -92,12 +92,9 @@ $lang->resource->my->work            = 'workAction';
 $lang->resource->my->audit           = 'audit';
 $lang->resource->my->contribute      = 'contributeAction';
 $lang->resource->my->project         = 'project';
-$lang->resource->my->profile         = 'profileAction';
 $lang->resource->my->uploadAvatar    = 'uploadAvatar';
-$lang->resource->my->preference      = 'preference';
 $lang->resource->my->dynamic         = 'dynamicAction';
 $lang->resource->my->editProfile     = 'editProfile';
-$lang->resource->my->changePassword  = 'changePassword';
 $lang->resource->my->manageContacts  = 'manageContacts';
 $lang->resource->my->deleteContacts  = 'deleteContacts';
 $lang->resource->my->score           = 'score';
diff --git a/module/group/packagemanager.php b/module/group/packagemanager.php
index 8ff7db54fc..63aca60451 100644
--- a/module/group/packagemanager.php
+++ b/module/group/packagemanager.php
@@ -548,16 +548,8 @@ $config->group->package->profile = new stdclass();
 $config->group->package->profile->order  = 5;
 $config->group->package->profile->subset = 'personalsettings';
 $config->group->package->profile->privs  = array();
-$config->group->package->profile->privs['my-profile']        = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd,lite,or', 'order' => 0, 'depend' => array('my-index'), 'recommend' => array());
-$config->group->package->profile->privs['my-uploadAvatar']   = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd,lite,or', 'order' => 2, 'depend' => array('my-index', 'my-profile'), 'recommend' => array());
-$config->group->package->profile->privs['my-editProfile']    = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd,lite,or', 'order' => 1, 'depend' => array('my-index', 'my-profile'), 'recommend' => array());
-$config->group->package->profile->privs['my-changePassword'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd,lite,or', 'order' => 3, 'depend' => array('my-index', 'my-profile'), 'recommend' => array());
-
-$config->group->package->preference = new stdclass();
-$config->group->package->preference->order  = 10;
-$config->group->package->preference->subset = 'personalsettings';
-$config->group->package->preference->privs  = array();
-$config->group->package->preference->privs['my-preference'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 40, 'depend' => array('my-index'), 'recommend' => array());
+$config->group->package->profile->privs['my-uploadAvatar'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd,lite,or', 'order' => 2, 'depend' => array('my-index', 'my-profile'), 'recommend' => array());
+$config->group->package->profile->privs['my-editProfile']  = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd,lite,or', 'order' => 1, 'depend' => array('my-index', 'my-profile'), 'recommend' => array());
 
 $config->group->package->browseProgram = new stdclass();
 $config->group->package->browseProgram->order  = 5;