vitalif
/
bugzilla-4intranet
mirror of https://github.com/vitalif/bugzilla-4intranet
1
0
Fork 0
Code Issues Releases Wiki Activity

Bug 100052 - Nano fixes 

git-svn-id: svn://svn.office.custis.ru/3rdparty/bugzilla.org/trunk@1694 6955db30-a419-402b-8a0d-67ecbb4d7f56
master
vfilippov 2013-06-21 13:45:16 +00:00
parent 820208f0bd
commit 41242f3b86
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Bugzilla/Bug.pm
View File

@ -1749,14 +1749,14 @@ sub _check_keywords {
if (!$obj) if (!$obj)
{ {
my $this_kd = ""; 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({ my $obj = Bugzilla::Keyword->create({
name => $keyword, name => $keyword,
description => $this_kd description => $this_kd,
}); });
$keywords{$obj->id} = $obj; $keywords{$obj->id} = $obj;
} }

4
extensions/custis/lib/CustisDBHooks.pm
View File

@ -8,6 +8,7 @@ use utf8;
use Encode; use Encode;
use URI::Escape; use URI::Escape;
use Bugzilla::Constants; use Bugzilla::Constants;
use Bugzilla::Field;
# Модификации схемы БД # Модификации схемы БД
sub db_schema_abstract_schema sub db_schema_abstract_schema
@ -369,7 +370,8 @@ sub install_update_db
# Bug 100052 - Сообщения от зависимых багов # Bug 100052 - Сообщения от зависимых багов
if (!$dbh->selectrow_array('SELECT * FROM email_setting WHERE event=\''.EVT_DEPEND_REOPEN.'\' LIMIT 1')) 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( $dbh->do(
'INSERT INTO email_setting (user_id, relationship, event)'. 'INSERT INTO email_setting (user_id, relationship, event)'.
' SELECT p.userid, ?, ? FROM profiles p WHERE p.disable_mail=0', undef, $rel, EVT_DEPEND_REOPEN ' SELECT p.userid, ?, ? FROM profiles p WHERE p.disable_mail=0', undef, $rel, EVT_DEPEND_REOPEN