Upgrade bugs.webkit.org to Bugzilla 4.2
<http://webkit.org/b/55882>
Upgrade to Bugzilla 4.2.1.
Conflicts:
.htaccess
Bugzilla.pm
Bugzilla/Auth.pm
Bugzilla/Auth/Login/CGI.pm
Bugzilla/Auth/Persist/Cookie.pm
Bugzilla/Bug.pm
Bugzilla/BugMail.pm
Bugzilla/CGI.pm
Bugzilla/Config/Attachment.pm
Bugzilla/Config/Common.pm
Bugzilla/Config/General.pm
Bugzilla/Constants.pm
Bugzilla/DB/Mysql.pm
Bugzilla/DB/Oracle.pm
Bugzilla/DB/Schema.pm
Bugzilla/DB/Schema/Oracle.pm
Bugzilla/Error.pm
Bugzilla/Flag.pm
Bugzilla/FlagType.pm
Bugzilla/Hook.pm
Bugzilla/Install/DB.pm
Bugzilla/Install/Filesystem.pm
Bugzilla/Install/Localconfig.pm
Bugzilla/Install/Requirements.pm
Bugzilla/Install/Util.pm
Bugzilla/Mailer.pm
Bugzilla/Product.pm
Bugzilla/Search.pm
Bugzilla/Search/Quicksearch.pm
Bugzilla/Search/Saved.pm
Bugzilla/Series.pm
Bugzilla/Template.pm
Bugzilla/Template/Plugin/Hook.pm
Bugzilla/Token.pm
Bugzilla/User.pm
Bugzilla/Util.pm
Bugzilla/WebService.pm
Bugzilla/WebService/Bug.pm
Bugzilla/WebService/Bugzilla.pm
Bugzilla/WebService/Constants.pm
Bugzilla/WebService/Product.pm
Bugzilla/WebService/User.pm
attachment.cgi
buglist.cgi
checksetup.pl
colchange.cgi
collectstats.pl
contrib/bugzilla_ldapsync.rb
contrib/bzdbcopy.pl
contrib/gnats2bz.pl
contrib/recode.pl
contrib/sendbugmail.pl
contrib/yp_nomail.sh
docs/en/xml/Bugzilla-Guide.xml
docs/en/xml/about.xml
docs/en/xml/installation.xml
docs/en/xml/security.xml
docs/en/xml/troubleshooting.xml
editflagtypes.cgi
editparams.cgi
editproducts.cgi
editvalues.cgi
editwhines.cgi
email_in.pl
enter_bug.cgi
extensions/BmpConvert/Config.pm
extensions/OldBugMove/template/en/default/admin/params/oldbugmove.html.tmpl
extensions/Voting/template/en/default/hook/bug/process/header-title.html.tmpl
extensions/Voting/template/en/default/hook/search/search-report-select-rep_fields.html.tmpl
extensions/example/code/webservice-error_codes.pl
extensions/example/version.pl
images/favicon.ico
importxml.pl
index.cgi
install-module.pl
js/field.js
js/util.js
long_list.cgi
mod_perl.pl
post_bug.cgi
process_bug.cgi
quips.cgi
sanitycheck.cgi
show_bug.cgi
showattachment.cgi
sidebar.cgi
skins/contrib/Dusk/global.css
skins/contrib/Dusk/index.css
skins/standard/global.css
skins/standard/show_bug.css
t/008filter.t
template/en/custom/attachment/review.html.tmpl
template/en/default/account/prefs/saved-searches.html.tmpl
template/en/default/admin/classifications/delete.html.tmpl
template/en/default/admin/classifications/edit-common.html.tmpl
template/en/default/admin/classifications/footer.html.tmpl
template/en/default/admin/components/create.html.tmpl
template/en/default/admin/components/edit.html.tmpl
template/en/default/admin/params/attachment.html.tmpl
template/en/default/admin/sanitycheck/messages.html.tmpl
template/en/default/admin/users/confirm-delete.html.tmpl
template/en/default/admin/workflow/edit.html.tmpl
template/en/default/attachment/created.html.tmpl
template/en/default/attachment/diff-header.html.tmpl
template/en/default/attachment/edit.html.tmpl
template/en/default/attachment/list.html.tmpl
template/en/default/attachment/updated.html.tmpl
template/en/default/bug/comments.html.tmpl
template/en/default/bug/create/create-guided.html.tmpl
template/en/default/bug/create/create.html.tmpl
template/en/default/bug/create/created.html.tmpl
template/en/default/bug/edit.html.tmpl
template/en/default/bug/field.html.tmpl
template/en/default/bug/process/header.html.tmpl
template/en/default/bug/show.html.tmpl
template/en/default/bug/show.xml.tmpl
template/en/default/config.rdf.tmpl
template/en/default/email/whine.txt.tmpl
template/en/default/filterexceptions.pl
template/en/default/flag/list.html.tmpl
template/en/default/global/common-links.html.tmpl
template/en/default/global/confirm-action.html.tmpl
template/en/default/global/field-descs.none.tmpl
template/en/default/global/footer.html.tmpl
template/en/default/global/header.html.tmpl
template/en/default/global/user-error.html.tmpl
template/en/default/global/userselect.html.tmpl
template/en/default/list/edit-multiple.html.tmpl
template/en/default/list/list.html.tmpl
template/en/default/pages/fields.html.tmpl
template/en/default/pages/release-notes.html.tmpl
template/en/default/search/boolean-charts.html.tmpl
template/en/default/search/form.html.tmpl
template/en/default/search/search-report-graph.html.tmpl
template/en/default/search/search-report-table.html.tmpl
template/en/default/setup/strings.txt.pl
token.cgi
userprefs.cgi
xml.cgi
xmlrpc.cgi
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@174764 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Websites/bugs.webkit.org/editkeywords.cgi b/Websites/bugs.webkit.org/editkeywords.cgi
index 5eabaed..3cd6c94 100755
--- a/Websites/bugs.webkit.org/editkeywords.cgi
+++ b/Websites/bugs.webkit.org/editkeywords.cgi
@@ -131,8 +131,10 @@
my $keyword = new Bugzilla::Keyword($key_id)
|| ThrowCodeError('invalid_keyword_id', { id => $key_id });
- $keyword->set_name($cgi->param('name'));
- $keyword->set_description($cgi->param('description'));
+ $keyword->set_all({
+ name => scalar $cgi->param('name'),
+ description => scalar $cgi->param('description'),
+ });
my $changes = $keyword->update();
delete_token($token);
@@ -167,14 +169,14 @@
my $keyword = new Bugzilla::Keyword($key_id)
|| ThrowCodeError('invalid_keyword_id', { id => $key_id });
- $dbh->do('DELETE FROM keywords WHERE keywordid = ?', undef, $keyword->id);
- $dbh->do('DELETE FROM keyworddefs WHERE id = ?', undef, $keyword->id);
+ $keyword->remove_from_db();
delete_token($token);
print $cgi->header();
$vars->{'message'} = 'keyword_deleted';
+ $vars->{'keyword'} = $keyword;
$vars->{'keywords'} = Bugzilla::Keyword->get_all_with_bug_count();
$template->process("admin/keywords/list.html.tmpl", $vars)
@@ -182,4 +184,4 @@
exit;
}
-ThrowCodeError("action_unrecognized", $vars);
+ThrowUserError('unknown_action', {action => $action});
