Commit e7fe31a7 authored by Marius Burkard's avatar Marius Burkard
Browse files

Revert unique forward

parent 22bef49d
Pipeline #9436 passed with stage
in 10 minutes and 50 seconds
......@@ -2,7 +2,7 @@
if(!defined('INSTALLER_RUN')) die('Patch update file access violation.');
class upd_0094 extends installer_patch_update {
/*class upd_0094 extends installer_patch_update {
public function onBeforeSQL() {
global $inst;
......@@ -12,3 +12,4 @@ class upd_0094 extends installer_patch_update {
}
}
*/
\ No newline at end of file
......@@ -7,7 +7,7 @@ ALTER TABLE `spamfilter_users` ALTER `policy_id` SET DEFAULT 0;
-- mail_forwarding.source must be unique
ALTER TABLE `mail_forwarding` DROP KEY `server_id`;
ALTER TABLE `mail_forwarding` ADD UNIQUE KEY `server_id` (`server_id`, `source`);
ALTER TABLE `mail_forwarding` ADD KEY `server_id` (`server_id`, `source`);
-- Purge apps & addons installer (#5795) - second time due to syntax error in 0093
DROP TABLE IF EXISTS `software_package`;
......
......@@ -918,7 +918,7 @@ CREATE TABLE `mail_forwarding` (
`allow_send_as` ENUM('n','y') NOT NULL DEFAULT 'n',
`greylisting` enum('n','y' ) NOT NULL DEFAULT 'n',
PRIMARY KEY (`forwarding_id`),
UNIQUE KEY `server_id` (`server_id`, `source`),
KEY `server_id` (`server_id`, `source`),
KEY `type` (`type`)
) DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
......
......@@ -83,8 +83,6 @@ $form["tabs"]['alias'] = array (
),
'validators' => array ( 0 => array ( 'type' => 'ISEMAIL',
'errmsg'=> 'email_error_isemail'),
1 => array ( 'type' => 'UNIQUE',
'errmsg'=> 'email_error_unique'),
),
'default' => '',
'value' => '',
......
......@@ -83,8 +83,6 @@ $form["tabs"]['forward'] = array (
),
'validators' => array ( 0 => array ( 'type' => 'ISEMAIL',
'errmsg'=> 'email_error_isemail'),
1 => array ( 'type' => 'UNIQUE',
'errmsg'=> 'email_error_unique'),
),
'default' => '',
'value' => '',
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment