diff --git a/module/dev/view/editor.html.php b/module/dev/view/editor.html.php
index 16a0229441..f905338d56 100644
--- a/module/dev/view/editor.html.php
+++ b/module/dev/view/editor.html.php
@@ -15,7 +15,7 @@
   <div class='text-center'>
     <?php
     echo $lang->dev->noteEditor;
-    if(common::hasPriv('editor', 'switch')) echo html::a($this->createLink('editor', 'switch', 'status=1'), $lang->dev->switchList[1], '', "class='btn btn-primary'");
+    if(common::hasPriv('editor', 'turnon')) echo html::a($this->createLink('editor', 'turnon', 'status=1'), $lang->dev->switchList[1], '', "class='btn btn-primary'");
     ?>
   </div>
 </div>
diff --git a/module/editor/control.php b/module/editor/control.php
index f3956a5ffd..4186dee101 100644
--- a/module/editor/control.php
+++ b/module/editor/control.php
@@ -197,7 +197,7 @@ class editor extends control
      * @access public
      * @return void
      */
-    public function switch($status)
+    public function turnon($status)
     {
         $this->loadModel('setting')->setItem('system.common.global.editor', $status);
 
diff --git a/module/editor/view/index.html.php b/module/editor/view/index.html.php
index 35bf66b4ef..17fdfa33b9 100644
--- a/module/editor/view/index.html.php
+++ b/module/editor/view/index.html.php
@@ -11,12 +11,12 @@
  */
 ?>
 <?php include $app->getModuleRoot() . 'dev/view/header.html.php';?>
-<?php if(common::hasPriv('editor', 'switch')):?>
+<?php if(common::hasPriv('editor', 'turnon')):?>
 <div id='mainMenu' class='clearfix menu-secondary'>
   <div class="pull-left">
     <?php
     echo $lang->editor->turnOff;
-    echo html::a($this->createLink('editor', 'switch', 'status=0'), $lang->dev->switchList['0'], '', "class='btn btn-sm'");
+    echo html::a($this->createLink('editor', 'turnon', 'status=0'), $lang->dev->switchList['0'], '', "class='btn btn-sm'");
     ?>
   </div>
 </div>
diff --git a/module/mail/config.php b/module/mail/config.php
index 2fbfa040cb..16d3e0b39b 100644
--- a/module/mail/config.php
+++ b/module/mail/config.php
@@ -10,7 +10,7 @@ $config->mail->fromAddress = '';            // The from address.
 $config->mail->fromName    = '';            // The from name.
 $config->mail->mta         = 'smtp';        // The send mail type.
 $config->mail->smtp->debug    = 0;          // Debug level, 0,1,2.
-$config->mail->smtp->charset  = 'utf-8';    // Charset 
+$config->mail->smtp->charset  = 'utf-8';    // Charset
 $config->mail->smtp->auth     = true;       // Need auth or not. true|false
 $config->mail->smtp->host     = 'localhost';// The smtp server host address.
 $config->mail->smtp->port     = '25';       // The smtp server host port.