From 7ef420688efa6fd178a33803e88cbd3b2a39dc71 Mon Sep 17 00:00:00 2001
From: zhouxudong <zhouxudong@easycorp.ltd>
Date: Thu, 19 May 2022 07:53:07 +0000
Subject: [PATCH] * Finish task #54471.

---
 module/common/model.php            | 2 +-
 module/my/control.php              | 3 ++-
 module/my/view/preference.html.php | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/module/common/model.php b/module/common/model.php
index b3ef19aac3..2ef0c334fe 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -450,7 +450,7 @@ class commonModel extends model
                         echo '<li class="user-tutorial">' . html::a(helper::createLink('tutorial', 'start'), "<i class='icon icon-guide'></i> " . $lang->tutorialAB, '', "class='iframe' data-class-name='modal-inverse' data-width='800' data-headerless='true' data-backdrop='true' data-keyboard='true'") . '</li>';
                     }
 
-                    echo '<li>' . html::a(helper::createLink('my', 'preference', '', '', true), "<i class='icon icon-controls'></i> " . $lang->preference, '', "class='iframe' data-width='700'") . '</li>';
+                    echo '<li>' . html::a(helper::createLink('my', 'preference', 'false', '', true), "<i class='icon icon-controls'></i> " . $lang->preference, '', "class='iframe' data-width='700'") . '</li>';
                 }
 
                 if(common::hasPriv('my', 'changePassword')) echo '<li>' . html::a(helper::createLink('my', 'changepassword', '', '', true), "<i class='icon icon-cog-outline'></i> " . $lang->changePassword, '', "class='iframe' data-width='600'") . '</li>';
diff --git a/module/my/control.php b/module/my/control.php
index f4c29ef4dd..3850eda41f 100755
--- a/module/my/control.php
+++ b/module/my/control.php
@@ -1205,7 +1205,7 @@ EOF;
      * @access public
      * @return void
      */
-    public function preference()
+    public function preference($showTip = true)
     {
         $this->loadModel('setting');
 
@@ -1221,6 +1221,7 @@ EOF;
 
         $this->view->title      = $this->lang->my->common . $this->lang->colon . $this->lang->my->preference;
         $this->view->position[] = $this->lang->my->preference;
+        $this->view->showTip    = $showTip;
 
         $this->view->URSRList         = $this->loadModel('custom')->getURSRPairs();
         $this->view->URSR             = $this->setting->getURSR();
diff --git a/module/my/view/preference.html.php b/module/my/view/preference.html.php
index 509bc66434..73cf4e670b 100755
--- a/module/my/view/preference.html.php
+++ b/module/my/view/preference.html.php
@@ -70,7 +70,7 @@ html,body {height: 100%;}
       <tr>
         <td colspan='2' class='text-center form-actions'>
           <?php echo html::submitButton();?>
-          <?php if(!isonlybody()):?>
+          <?php if($showTip):?>
           <div>
             <p class='text-muted tip'><?php echo $lang->my->alert;?></p>
           </div>