3 files changed, 24 insertions, 3 deletions

diff --git a/Bugzilla/WebService/Bug.pm b/Bugzilla/WebService/Bug.pm
index 69dcb7d42..1ac7bf206 100644
--- a/Bugzilla/WebService/Bug.pm
+++ b/Bugzilla/WebService/Bug.pm
@@ -82,6 +82,8 @@ BEGIN {
 sub fields {
     my ($self, $params) = validate(@_, 'ids', 'names');
 
+    Bugzilla->switch_to_shadow_db();
+
     my @fields;
     if (defined $params->{ids}) {
         my $ids = $params->{ids};
@@ -242,7 +244,7 @@ sub comments {
     my $bug_ids = $params->{ids} || [];
     my $comment_ids = $params->{comment_ids} || [];
 
-    my $dbh  = Bugzilla->dbh;
+    my $dbh  = Bugzilla->switch_to_shadow_db();
     my $user = Bugzilla->user;
 
     my %bugs;
@@ -309,6 +311,8 @@ sub _translate_comment {
 sub get {
     my ($self, $params) = validate(@_, 'ids');
 
+    Bugzilla->switch_to_shadow_db();
+
     my $ids = $params->{ids};
     defined $ids || ThrowCodeError('param_required', { param => 'ids' });
 
@@ -343,6 +347,8 @@ sub get {
 sub history {
     my ($self, $params) = validate(@_, 'ids');
 
+    Bugzilla->switch_to_shadow_db();
+
     my $ids = $params->{ids};
     defined $ids || ThrowCodeError('param_required', { param => 'ids' });
 
@@ -399,7 +405,9 @@ sub history {
 
 sub search {
     my ($self, $params) = @_;
-    
+   
+    Bugzilla->switch_to_shadow_db();
+
     if ( defined($params->{offset}) and !defined($params->{limit}) ) {
         ThrowCodeError('param_required', 
                        { param => 'limit', function => 'Bug.search()' });
@@ -456,6 +464,8 @@ sub possible_duplicates {
     my ($self, $params) = validate(@_, 'product');
     my $user = Bugzilla->user;
 
+    Bugzilla->switch_to_shadow_db();
+
     # Undo the array-ification that validate() does, for "summary".
     $params->{summary} || ThrowCodeError('param_required',
         { function => 'Bug.possible_duplicates', param => 'summary' });
@@ -593,6 +603,8 @@ sub create {
 sub legal_values {
     my ($self, $params) = @_;
 
+    Bugzilla->switch_to_shadow_db();
+
     defined $params->{field} 
         or ThrowCodeError('param_required', { param => 'field' });
 
@@ -802,6 +814,8 @@ sub update_see_also {
 sub attachments {
     my ($self, $params) = validate(@_, 'ids', 'attachment_ids');
 
+    Bugzilla->switch_to_shadow_db();
+
     if (!(defined $params->{ids}
           or defined $params->{attachment_ids}))
     {
diff --git a/Bugzilla/WebService/Product.pm b/Bugzilla/WebService/Product.pm
index 3cd0d0a6c..c705ece28 100644
--- a/Bugzilla/WebService/Product.pm
+++ b/Bugzilla/WebService/Product.pm
@@ -47,23 +47,28 @@ BEGIN { *get_products = \&get }
 
 # Get the ids of the products the user can search
 sub get_selectable_products {
+    Bugzilla->switch_to_shadow_db();
     return {ids => [map {$_->id} @{Bugzilla->user->get_selectable_products}]}; 
 }
 
 # Get the ids of the products the user can enter bugs against
 sub get_enterable_products {
+    Bugzilla->switch_to_shadow_db();
     return {ids => [map {$_->id} @{Bugzilla->user->get_enterable_products}]}; 
 }
 
 # Get the union of the products the user can search and enter bugs against.
 sub get_accessible_products {
+    Bugzilla->switch_to_shadow_db();
     return {ids => [map {$_->id} @{Bugzilla->user->get_accessible_products}]}; 
 }
 
 # Get a list of actual products, based on list of ids or names
 sub get {
     my ($self, $params) = validate(@_, 'ids', 'names');
-    
+
+    Bugzilla->switch_to_shadow_db();
+
     # Only products that are in the users accessible products, 
     # can be allowed to be returned
     my $accessible_products = Bugzilla->user->get_accessible_products;
diff --git a/Bugzilla/WebService/User.pm b/Bugzilla/WebService/User.pm
index 90a07043c..9502770de 100644
--- a/Bugzilla/WebService/User.pm
+++ b/Bugzilla/WebService/User.pm
@@ -127,6 +127,8 @@ sub create {
 sub get {
     my ($self, $params) = validate(@_, 'names', 'ids');
 
+    Bugzilla->switch_to_shadow_db();
+
     defined($params->{names}) || defined($params->{ids})
         || defined($params->{match})
         || ThrowCodeError('params_required',