diff options
| author | Byron Jones <glob@mozilla.com> | 2015-03-05 05:57:51 +0100 |
|---|---|---|
| committer | Byron Jones <glob@mozilla.com> | 2015-03-05 05:57:51 +0100 |
| commit | b7147b778824e13a15f912fdf458bf3959d439e5 (patch) | |
| tree | 1deddd019fb15747dacc3067d0c2606f864fc41c /Bugzilla/Token.pm | |
| parent | f6686ca1edfe4a233c7f39836e265d466bda37b7 (diff) | |
| download | bugzilla-b7147b778824e13a15f912fdf458bf3959d439e5.tar.gz bugzilla-b7147b778824e13a15f912fdf458bf3959d439e5.tar.xz | |
Bug 1128853: Bugzilla shouldn't try to write API tokens into the shadow DB
r=dkl,a=glob
Diffstat (limited to 'Bugzilla/Token.pm')
| -rw-r--r-- | Bugzilla/Token.pm | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Bugzilla/Token.pm b/Bugzilla/Token.pm index 24ffad3c3..84d86b8c6 100644 --- a/Bugzilla/Token.pm +++ b/Bugzilla/Token.pm @@ -432,6 +432,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(); @@ -444,8 +447,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; } } |