* [bug#57800,0.5h] rename the method clear to flush because it is declared in baseControl class.

db/update21.1.sql

@@ -81,7 +81,7 @@ CREATE INDEX `idx_object` ON `zt_mark`(`objectType`,`objectID`);
 CREATE INDEX `idx_account` ON `zt_mark`(`account`);
 
 UPDATE `zt_grouppriv` SET `module` = 'cache', `method` = 'setting' WHERE `module` = 'admin' AND `method` = 'cache';
-INSERT INTO `zt_grouppriv` SELECT `group`, 'cache', 'clear' FROM `zt_grouppriv` WHERE `module` = 'cache' AND `method` = 'setting';
+INSERT INTO `zt_grouppriv` SELECT `group`, 'cache', 'flush' FROM `zt_grouppriv` WHERE `module` = 'cache' AND `method` = 'setting';
 INSERT INTO `zt_grouppriv` SELECT DISTINCT `group`, 'system', 'create' FROM `zt_grouppriv` WHERE `module` IN ('release', 'projectrelease', 'build', 'projectbuild') AND `method` = 'create';
 
 UPDATE `zt_pivot` SET `version` = '1';

db/zentao.sql

@@ -3370,7 +3370,7 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (1,	'build',	'unlinkBug'),
 (1,	'build',	'unlinkStory'),
 (1,	'build',	'view'),
-(1,	'cache',	'clear'),
+(1,	'cache',	'flush'),
 (1,	'cache',	'setting'),
 (1,	'caselib',	'batchCreateCase'),
 (1,	'caselib',	'batchEditCase'),
@@ -12906,7 +12906,7 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (20, 'branch', 'mergeBranch'),
 (20, 'branch', 'sort'),
 (20, 'cache', 'setting'),
-(20, 'cache', 'clear'),
+(20, 'cache', 'flush'),
 (20, 'charter', 'browse'),
 (20, 'charter', 'create'),
 (20, 'charter', 'delete'),

module/cache/control.php

@@ -104,7 +104,7 @@ class cache extends control
      * @access public
      * @return void
      */
-    public function clear()
+    public function flush()
     {
         $this->cache->clear();
         return $this->send(array('result' => 'success', 'message' => $this->lang->cache->clearSuccess, 'load' => true));

module/cache/ui/setting.html.php

@@ -13,14 +13,14 @@ namespace zin;
 $hiddenCache = $config->cache->enable ? '' : ' hidden';
 $hiddenApcu  = !$hiddenCache && $config->cache->driver == 'apcu'  ? '' : ' hidden';
 $hiddenRedis = !$hiddenCache && $config->cache->driver == 'redis' ? '' : ' hidden';
-$canClear    = $config->cache->enable && hasPriv('cache', 'clear');
+$canClear    = $config->cache->enable && hasPriv('cache', 'flush');
 
 formPanel
 (
     set::actions
     ([
         'submit',
-        $canClear ? ['text' => $lang->cache->clear, 'url' => inlink('ajaxClear'), 'class' => 'secondary ajax-submit'] : null,
+        $canClear ? ['text' => $lang->cache->clear, 'url' => inlink('flush'), 'class' => 'secondary ajax-submit'] : null,
         'cancel'
     ]),
     on::change('input[name=enable]', 'toggleCache'),

module/group/lang/resource.php

@@ -1898,10 +1898,10 @@ $lang->admin->methodOrder[40] = 'tableEngine';
 /* Cache. */
 $lang->resource->cache = new stdclass();
 $lang->resource->cache->setting = 'setting';
-$lang->resource->cache->clear   = 'clear';
+$lang->resource->cache->flush   = 'clear';
 
 $lang->cache->methodOrder[5] = 'setting';
-$lang->cache->methodOrder[5] = 'clear';
+$lang->cache->methodOrder[5] = 'flush';
 
 /* Extension. */
 $lang->resource->extension = new stdclass();

module/group/packagemanager.php

@@ -2878,7 +2878,7 @@ $config->group->package->systemSetting->order  = 5;
 $config->group->package->systemSetting->subset = 'systemsetting';
 $config->group->package->systemSetting->privs  = array();
 $config->group->package->systemSetting->privs['cache-setting']      = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd,or', 'order' => 45, 'depend' => array('admin-index'), 'recommend' => array());
-$config->group->package->systemSetting->privs['cache-clear']        = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd,or', 'order' => 45, 'depend' => array('admin-index', 'cache-setting'), 'recommend' => array());
+$config->group->package->systemSetting->privs['cache-flush']        = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd,or', 'order' => 45, 'depend' => array('admin-index', 'cache-setting'), 'recommend' => array());
 $config->group->package->systemSetting->privs['admin-tableEngine']  = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd,or', 'order' => 45, 'depend' => array('admin-index'), 'recommend' => array());
 $config->group->package->systemSetting->privs['custom-timezone']    = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd,lite,or', 'order' => 45, 'depend' => array('admin-index'), 'recommend' => array());
 $config->group->package->systemSetting->privs['custom-libreoffice'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd,lite', 'order' => 100, 'depend' => array(), 'recommend' => array());