diff --git a/module/action/model.php b/module/action/model.php index f83b7c1ad2..602b774f8c 100755 --- a/module/action/model.php +++ b/module/action/model.php @@ -356,7 +356,7 @@ class actionModel extends model ->andWhere('((action')->ne('deleted')->andWhere('objectID')->in($objectID)->markRight(1) ->orWhere('(action')->eq('deleted')->andWhere('objectID')->in($modules)->markRight(1)->markRight(1) ->fi() - ->beginIF(strpos('project,case,story,module', $objectType) === false) + ->beginIF(!in_array($objectType, array('project', 'case', 'story', 'module'))) ->where('objectType')->eq($objectType) ->andWhere('objectID')->in($objectID) ->fi() diff --git a/module/admin/lang/menu.php b/module/admin/lang/menu.php index bf0448e0e7..c181bade36 100644 --- a/module/admin/lang/menu.php +++ b/module/admin/lang/menu.php @@ -39,10 +39,13 @@ $lang->admin->menuList->dev['name'] = $lang->admin->menuSetting['dev']['name']; $lang->admin->menuList->dev['desc'] = $lang->admin->menuSetting['dev']['desc']; $lang->admin->menuList->dev['order'] = 45; -$lang->admin->menuList->convert['name'] = $lang->admin->menuSetting['convert']['name']; -$lang->admin->menuList->convert['desc'] = $lang->admin->menuSetting['convert']['desc']; -$lang->admin->menuList->convert['link'] = 'convert|convertjira'; -$lang->admin->menuList->convert['order'] = 50; +if($config->db->driver == 'mysql') +{ + $lang->admin->menuList->convert['name'] = $lang->admin->menuSetting['convert']['name']; + $lang->admin->menuList->convert['desc'] = $lang->admin->menuSetting['convert']['desc']; + $lang->admin->menuList->convert['link'] = 'convert|convertjira'; + $lang->admin->menuList->convert['order'] = 50; +} $lang->admin->menuList->system['subMenu']['mode'] = array('link' => "{$lang->custom->mode}|custom|mode|"); $lang->admin->menuList->system['subMenu']['trash'] = array('link' => "{$lang->action->trash}|action|trash|");