diff --git a/Bugzilla/Install/DB.pm b/Bugzilla/Install/DB.pm
index e0affc21a..d0863ba0a 100644
--- a/Bugzilla/Install/DB.pm
+++ b/Bugzilla/Install/DB.pm
@@ -3286,7 +3286,7 @@ sub _populate_bugs_fulltext
$sthn = @ids;
$sth = $dbh->prepare(
"INSERT INTO bugs_fulltext (bug_id, short_desc, comments, comments_noprivate)" .
- " VALUES " . join(",", ("(?,?,?,?)") x @ids) . " ON UPDATE SET bug_id=bug_id"
+ " VALUES " . join(",", ("(?,?,?,?)") x @ids) . " ON DUPLICATE KEY UPDATE SET bug_id=VALUES(bug_id)"
);
}
$sth->execute(map { ($_, @{$rows->{$_}}) } @ids);
diff --git a/data/params.bugs3 b/data/params.bugs3
index 9c28d6fdf..b0a03a7ec 100644
--- a/data/params.bugs3
+++ b/data/params.bugs3
@@ -10,7 +10,7 @@
'RADIUS_email_suffix' => '',
'RADIUS_secret' => '',
'RADIUS_server' => '',
- 'allow-test-deletion' => 0,
+ 'allow-test-deletion' => '1',
'allow_attach_url' => 0,
'allow_attachment_deletion' => 0,
'allow_attachment_display' => '1',
@@ -22,6 +22,7 @@
'auth_env_email' => 'REMOTE_USER',
'auth_env_id' => '',
'auth_env_realname' => '',
+ 'auto_add_flag_requestees_to_cc' => '1',
'bonsai_url' => '',
'bug-to-test-case-action' => 'Verify that bug %id% is fixed: %description%',
'bug-to-test-case-results' => '',
@@ -31,13 +32,12 @@
'commentonchange_resolution' => 0,
'commentonduplicate' => 0,
'confirmuniqueusermatch' => 1,
- 'convert_uncompressed_images' => 0,
- 'cookiedomain' => '',
+ 'cookiedomain' => 'bugs.office.custis.ru',
'cookiepath' => '/bugs',
'createemailregexp' => '.*',
'cvsroot' => '',
'cvsroot_get' => '',
- 'default-test-case-status' => 'PROPOSED',
+ 'default-test-case-status' => 'CONFIRMED',
'defaultopsys' => 'All',
'defaultplatform' => 'All',
'defaultpriority' => 'P3',
@@ -50,6 +50,7 @@
'emailregexp' => '^[\\w\\.\\+\\-=]+@[\\w\\.\\-]+\\.[\\w\\-]+$',
'emailregexpdesc' => 'A legal address must contain exactly one \'@\', and at least one \'.\' after the @.',
'emailsuffix' => '',
+ 'error_log' => 'errorlog',
'force_attach_bigfile' => 1,
'globalwatchers' => '',
'graph_font' => '/usr/share/fonts/truetype/windows/seguibk.ttf',
@@ -58,16 +59,17 @@
'gzstable_url' => 'http://gazprom.office.custis.ru/gzstable/index.php/',
'gzwiki_url' => 'http://gazprom.office.custis.ru/gzwiki/index.php/',
'hrwiki_url' => 'http://hrwiki.office.custis.ru/hrwiki/index.php/',
+ 'inbound_proxies' => '',
'inline_attachment_mime' => '^text/|^image/',
'insidergroup' => 'InsiderGroup',
'letsubmitterchoosemilestone' => 1,
'letsubmitterchoosepriority' => 1,
+ 'levenshteinusermatch' => '4',
'localdottimeout' => 5,
- 'loginnetmask' => '0',
'lxr_root' => '',
'lxr_url' => '',
'mail_delivery_method' => 'Sendmail',
- 'mailfrom' => 'bugzilla-daemon',
+ 'mailfrom' => 'bugzilla-daemon@custis.ru',
'maintainer' => 'vfilippov@custis.ru',
'makeproductgroups' => '1',
'maxattachmentsize' => '5000',
@@ -85,18 +87,17 @@
'movers' => '',
'musthavemilestoneonaccept' => 0,
'mybugstemplate' => 'buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&email1=%userid%&emailtype1=exact&emailassigned_to1=1&emailreporter1=1',
- 'new-case-action-template' => '
- -
-
',
+ 'new-case-action-template' => '',
'new-case-results-template' => '',
'noresolveonopenblockers' => '0',
'orwiki_url' => 'http://lodge.office.custis.ru/orwiki/index.php/',
'proxy_url' => 'http://proxy.custis.ru:3128/',
'querysharegroup' => 'editbugs',
- 'quicksearch_comment_cutoff' => '4',
'quip_list_entry_control' => 'open',
'rdwiki_url' => 'http://radey.office.custis.ru/rdwiki/index.php/',
'rememberlogin' => 'on',
+ 'report_code_errors_to_maintainer' => '1',
+ 'report_user_errors_to_maintainer' => '0',
'requirelogin' => '1',
'sbwiki_url' => 'http://sobin.office.custis.ru/sbwiki/index.php/',
'sendmailnow' => 1,
@@ -104,7 +105,7 @@
'shadowdbhost' => '',
'shadowdbport' => '3306',
'shadowdbsock' => '',
- 'shutdownhtml' => '',
+ 'shutdownhtml' => "",
'smboa_url' => 'http://penguin.office.custis.ru/smboa/index.php/',
'smtp_debug' => 0,
'smtp_password' => '',
@@ -112,15 +113,15 @@
'smtpserver' => 'localhost',
'smwiki_url' => 'http://penguin.office.custis.ru/smwiki/index.php/',
'specific_search_allow_empty_words' => '1',
- 'ssl' => 'never',
+ 'ssl_redirect' => 0,
'sslbase' => '',
'strict_isolation' => 0,
- 'test_case_wiki_action_iframe' => '',
+ 'test_case_wiki_action_iframe' => '',
'testopia-allow-group-member-deletes' => 0,
'testopia-debug' => 'OFF',
'testopia-default-plan-testers-regexp' => undef,
'testopia-max-allowed-plan-testers' => '500',
- 'testopia-show-setup-breakdown' => '0',
+ 'testopia-show-setup-breakdown' => 0,
'timetrackinggroup' => "\x{432}\x{435}\x{441}\x{44c} \x{417}\x{418}\x{421}",
'upgrade_notification' => 'latest_stable_release',
'urlbase' => 'http://bugs.office.custis.ru/bugs/',
@@ -128,7 +129,6 @@
'use_see_also' => '0',
'usebugaliases' => '1',
'useclassification' => '1',
- 'useentrygroupdefault' => '1',
'usemenuforusers' => '0',
'useopsys' => '0',
'useplatform' => '0',
@@ -136,7 +136,6 @@
'user_info_class' => 'Env,CGI',
'user_mailto' => 'http://plantime.office.custis.ru/CurrentPresence.aspx?search=',
'user_verify_class' => 'DB',
- 'usermatchmode' => 'search',
'usestatuswhiteboard' => '1',
'usetargetmilestone' => '1',
'usevisibilitygroups' => 0,
@@ -145,6 +144,6 @@
'viewvc_url' => 'http://viewvc.office.custis.ru/viewvc.py/',
'webdotbase' => '/usr/bin/dot',
'webtwopibase' => '/usr/bin/twopi',
- 'whinedays' => 7,
+ 'whinedays' => '30',
'wiki_url' => 'http://wiki.office.custis.ru/wiki/index.php/'
);