From: Gervase Markham <gerv@gerv.net>
Date: Tue, 25 Nov 2014 10:28:41 +0000 (+0000)
Subject: Revert "Bug 317021 - improve description of bz_canusewhine* parameters. r=gerv."
X-Git-Tag: bugzilla-5.0rc1~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=45877e03a90ffdd5c21f8a9999375cf14f3aaa12;p=thirdparty%2Fbugzilla.git

Revert "Bug 317021 - improve description of bz_canusewhine* parameters. r=gerv."

This reverts commit 5d8aa524eff6409055d4d967d2857ede40be4cad.
---

diff --git a/Bugzilla/Install.pm b/Bugzilla/Install.pm
index 9b7becdcbc..07bc9d6c3b 100644
--- a/Bugzilla/Install.pm
+++ b/Bugzilla/Install.pm
@@ -133,13 +133,11 @@ use constant SYSTEM_GROUPS => (
     },
     {
         name         => 'bz_canusewhineatothers',
-        description  => 'Can configure queries and schedules for periodic'
-            . ' reports to be run and sent via email to other users and groups',
+        description  => 'Can configure whine reports for other users',
     },
     {
         name         => 'bz_canusewhines',
-        description  => 'Can configure queries and schedules for periodic'
-            . ' reports to be run and sent via email to themselves',
+        description  => 'User can configure whine reports for self',
         # inherited_by means that users in the groups listed below are
         # automatically members of bz_canusewhines.
         inherited_by => ['editbugs', 'bz_canusewhineatothers'],
diff --git a/Bugzilla/Install/DB.pm b/Bugzilla/Install/DB.pm
index 50daa3d462..96f14ec0ff 100644
--- a/Bugzilla/Install/DB.pm
+++ b/Bugzilla/Install/DB.pm
@@ -729,17 +729,6 @@ sub update_table_definitions {
     # 2014-11-10 dkl@mozilla.com - Bug 1093928
     $dbh->bz_drop_column('longdescs', 'is_markdown');
 
-    $dbh->do('UPDATE groups SET description = ? WHERE name = ? and description = ?',
-             undef,
-             "Can configure queries and schedules for periodic reports to be run and sent via email to other users and groups",
-             "bz_canusewhineatothers",
-             "Can configure whine reports for other users");
-    $dbh->do('UPDATE groups SET description = ? WHERE name = ? and description = ?',
-             undef,
-             "Can configure queries and schedules for periodic reports to be run and sent via email to themselves",
-             "bz_canusewhines",
-             "User can configure whine reports for self");
-
     ################################################################
     # New --TABLE-- changes should go *** A B O V E *** this point #
     ################################################################