From 2ccf81dec1fbe4e215ea47700a4e006420318621 Mon Sep 17 00:00:00 2001
From: Frédéric Buclin <LpSolit@gmail.com>
Date: Sun, 15 Mar 2015 13:50:28 +0100
Subject: Bug 902395: Enforce utf8 = true for all installations and remove the
 utf8 parameter r=dkl a=sgreen

---
 Bugzilla/Config/Common.pm  | 16 +---------------
 Bugzilla/Config/General.pm |  7 -------
 2 files changed, 1 insertion(+), 22 deletions(-)

(limited to 'Bugzilla/Config')

diff --git a/Bugzilla/Config/Common.pm b/Bugzilla/Config/Common.pm
index b6e58b318..52a2f8f11 100644
--- a/Bugzilla/Config/Common.pm
+++ b/Bugzilla/Config/Common.pm
@@ -25,7 +25,7 @@ use parent qw(Exporter);
     qw(check_multi check_numeric check_regexp check_group
        check_sslbase check_priority check_severity check_platform
        check_opsys check_shadowdb check_urlbase check_user_verify_class
-       check_ip check_mail_delivery_method check_notification check_utf8
+       check_ip check_mail_delivery_method check_notification
        check_bug_status check_smtp_auth check_theschwartz_available
        check_maxattachmentsize check_email check_smtp_ssl
        check_comment_taggers_group check_smtp_server
@@ -115,18 +115,6 @@ sub check_ip {
     return "";
 }
 
-sub check_utf8 {
-    my $utf8 = shift;
-    # You cannot turn off the UTF-8 parameter if you've already converted
-    # your tables to utf-8.
-    my $dbh = Bugzilla->dbh;
-    if ($dbh->isa('Bugzilla::DB::Mysql') && $dbh->bz_db_is_utf8 && !$utf8) {
-        return "You cannot disable UTF-8 support, because your MySQL database"
-               . " is encoded in UTF-8";
-    }
-    return "";
-}
-
 sub check_priority {
     my ($value) = (@_);
     my $legal_priorities = get_legal_field_values('priority');
@@ -490,8 +478,6 @@ valid group is provided.
 
 =item check_maxattachmentsize
 
-=item check_utf8
-
 =item check_group
 
 =item check_opsys
diff --git a/Bugzilla/Config/General.pm b/Bugzilla/Config/General.pm
index 380680590..8513a1f02 100644
--- a/Bugzilla/Config/General.pm
+++ b/Bugzilla/Config/General.pm
@@ -24,13 +24,6 @@ use constant get_param_list => (
    checker => \&check_email
   },
 
-  {
-   name => 'utf8',
-   type => 'b',
-   default => '0',
-   checker => \&check_utf8
-  },
-
   {
    name => 'shutdownhtml',
    type => 'l',
-- 
cgit v1.2.3-24-g4f1b