diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm index 402b02a8a..8b4454f23 100644 --- a/Bugzilla/Bug.pm +++ b/Bugzilla/Bug.pm @@ -1749,14 +1749,14 @@ sub _check_keywords { if (!$obj) { my $this_kd = ""; - if (exists(%keyword_descriptions->{$keyword})) + if (exists(%keyword_descriptions{$keyword})) { - $this_kd = %keyword_descriptions->{$keyword}; + $this_kd = %keyword_descriptions{$keyword}; } my $obj = Bugzilla::Keyword->create({ name => $keyword, - description => $this_kd + description => $this_kd, }); $keywords{$obj->id} = $obj; } diff --git a/extensions/custis/lib/CustisDBHooks.pm b/extensions/custis/lib/CustisDBHooks.pm index 5668d34bd..16914f954 100644 --- a/extensions/custis/lib/CustisDBHooks.pm +++ b/extensions/custis/lib/CustisDBHooks.pm @@ -8,6 +8,7 @@ use utf8; use Encode; use URI::Escape; use Bugzilla::Constants; +use Bugzilla::Field; # Модификации схемы БД sub db_schema_abstract_schema @@ -369,7 +370,8 @@ sub install_update_db # Bug 100052 - Сообщения от зависимых багов if (!$dbh->selectrow_array('SELECT * FROM email_setting WHERE event=\''.EVT_DEPEND_REOPEN.'\' LIMIT 1')) { - foreach my $rel (RELATIONSHIPS) { + foreach my $rel (grep { $_ != REL_GLOBAL_WATCHER } RELATIONSHIPS) + { $dbh->do( 'INSERT INTO email_setting (user_id, relationship, event)'. ' SELECT p.userid, ?, ? FROM profiles p WHERE p.disable_mail=0', undef, $rel, EVT_DEPEND_REOPEN