diff options
Diffstat (limited to 'Bugzilla')
| -rw-r--r-- | Bugzilla/Field.pm | 3 | ||||
| -rw-r--r-- | Bugzilla/Install.pm | 5 | ||||
| -rw-r--r-- | Bugzilla/Template.pm | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/Bugzilla/Field.pm b/Bugzilla/Field.pm index 4ec592164..c244e66d9 100644 --- a/Bugzilla/Field.pm +++ b/Bugzilla/Field.pm @@ -248,7 +248,8 @@ use constant DEFAULT_FIELDS => ( {name => "owner_idle_time", desc => "Time Since Assignee Touched"}, {name => 'see_also', desc => "See Also", type => FIELD_TYPE_BUG_URLS}, - {name => 'tag', desc => 'Tags', buglist => 1}, + {name => 'tag', desc => 'Tags', buglist => 1, + type => FIELD_TYPE_KEYWORDS}, ); ################ diff --git a/Bugzilla/Install.pm b/Bugzilla/Install.pm index bd591ecc8..f2c3902e4 100644 --- a/Bugzilla/Install.pm +++ b/Bugzilla/Install.pm @@ -61,8 +61,6 @@ sub SETTINGS { csv_colsepchar => { options => [',',';'], default => ',' }, # 2005-10-26 wurblzap@gmail.com -- Bug 291459 zoom_textareas => { options => ["on", "off"], default => "on" }, - # 2005-10-21 LpSolit@gmail.com -- Bug 313020 - per_bug_queries => { options => ['on', 'off'], default => 'off' }, # 2006-05-01 olav@bkor.dhs.org -- Bug 7710 state_addselfcc => { options => ['always', 'never', 'cc_unless_role'], default => 'cc_unless_role' }, @@ -192,6 +190,9 @@ sub update_settings { $settings{$setting}->{subclass}, undef, !$any_settings); } + + # Delete the obsolete 'per_bug_queries' user preference. Bug 616191. + $dbh->do('DELETE FROM setting WHERE name = ?', undef, 'per_bug_queries'); } sub update_system_groups { diff --git a/Bugzilla/Template.pm b/Bugzilla/Template.pm index 78c537cc3..e5bd8edb7 100644 --- a/Bugzilla/Template.pm +++ b/Bugzilla/Template.pm @@ -928,7 +928,9 @@ sub create { 'use_keywords' => sub { return Bugzilla::Keyword->any_exist; }, # All the keywords. - 'all_keywords' => sub { return Bugzilla::Keyword->get_all(); }, + 'all_keywords' => sub { + return [map { $_->name } Bugzilla::Keyword->get_all()]; + }, 'feature_enabled' => sub { return Bugzilla->feature(@_); }, |