From 887524670413292b71448bd0c67ab2b786c78b49 Mon Sep 17 00:00:00 2001 From: Byron Jones Date: Tue, 10 Mar 2015 13:13:49 +0800 Subject: Bug 1139749: backport bug 1128853 to bmo (Bugzilla shouldn't try to write API tokens into the shadow DB) --- Bugzilla/Token.pm | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'Bugzilla/Token.pm') diff --git a/Bugzilla/Token.pm b/Bugzilla/Token.pm index 769cb8800..750c36435 100644 --- a/Bugzilla/Token.pm +++ b/Bugzilla/Token.pm @@ -450,6 +450,9 @@ sub _create_token { trick_taint($tokentype); trick_taint($eventdata); + my $is_shadow = Bugzilla->is_shadow_db; + $dbh = Bugzilla->switch_to_main_db() if $is_shadow; + $dbh->bz_start_transaction(); my $token = GenerateUniqueToken(); @@ -462,8 +465,10 @@ sub _create_token { if (wantarray) { my (undef, $token_ts, undef) = GetTokenData($token); $token_ts = str2time($token_ts); + Bugzilla->switch_to_shadow_db() if $is_shadow; return ($token, $token_ts); } else { + Bugzilla->switch_to_shadow_db() if $is_shadow; return $token; } } -- cgit v1.2.3-24-g4f1b