diff --git a/mozilla/webtools/testopia/.bzrrev b/mozilla/webtools/testopia/.bzrrev
index 38017008e6f..0552576c870 100644
--- a/mozilla/webtools/testopia/.bzrrev
+++ b/mozilla/webtools/testopia/.bzrrev
@@ -1 +1 @@
-668
\ No newline at end of file
+669
\ No newline at end of file
diff --git a/mozilla/webtools/testopia/.gitrev b/mozilla/webtools/testopia/.gitrev
index 7f0ae4b367f..802f7e3601c 100644
--- a/mozilla/webtools/testopia/.gitrev
+++ b/mozilla/webtools/testopia/.gitrev
@@ -1 +1 @@
-21bc33a450e766a669c6c223797080a0ad3b8d14
\ No newline at end of file
+42f23c4b074da28df5bad5188abe1e0779210301
\ No newline at end of file
diff --git a/mozilla/webtools/testopia/extensions/Testopia/contrib/drivers/php/.xmlrpc.inc.php b/mozilla/webtools/testopia/extensions/Testopia/contrib/drivers/php/.xmlrpc.inc.php
index bb570ba1a5e..ef771a4ab36 100644
--- a/mozilla/webtools/testopia/extensions/Testopia/contrib/drivers/php/.xmlrpc.inc.php
+++ b/mozilla/webtools/testopia/extensions/Testopia/contrib/drivers/php/.xmlrpc.inc.php
@@ -1,7 +1,7 @@
 <?php
 // by Edd Dumbill (C) 1999-2002
 // <edd@usefulinc.com>
-// $Id: .xmlrpc.inc.php,v 1.31 2014-04-28 14:30:30 bzrmirror%bugzilla.org Exp $
+// $Id: .xmlrpc.inc.php,v 1.32 2014-04-28 14:30:42 bzrmirror%bugzilla.org Exp $
 
 // Copyright (c) 1999,2000,2002 Edd Dumbill.
 // All rights reserved.
diff --git a/mozilla/webtools/testopia/extensions/Testopia/lib/TestCase.pm b/mozilla/webtools/testopia/extensions/Testopia/lib/TestCase.pm
index c2cee3d1dfa..e86442e34f4 100644
--- a/mozilla/webtools/testopia/extensions/Testopia/lib/TestCase.pm
+++ b/mozilla/webtools/testopia/extensions/Testopia/lib/TestCase.pm
@@ -580,7 +580,7 @@ sub update {
 sub lookup_status {
     my ($id) = @_;
     my $dbh = Bugzilla->dbh;
-    trick_taint($id);
+    detaint_natural($id);
     my ($value) = $dbh->selectrow_array(
             "SELECT name 
                FROM test_case_status
@@ -604,7 +604,7 @@ sub lookup_status_by_name {
 sub lookup_category {
     my ($id) = @_;
     my $dbh = Bugzilla->dbh;
-    trick_taint($id);
+    detaint_natural($id);
     my ($value) = $dbh->selectrow_array(
             "SELECT name 
                FROM test_case_categories
@@ -628,7 +628,7 @@ sub lookup_category_by_name {
 sub lookup_priority {
     my ($id) = @_;
     my $dbh = Bugzilla->dbh;
-    trick_taint($id);
+    detaint_natural($id);
     my ($value) = $dbh->selectrow_array(
             "SELECT value 
                FROM priority
@@ -651,8 +651,8 @@ sub lookup_priority_by_value {
 
 sub lookup_default_tester {
     my ($id) = @_;
+    detaint_natural($id) or return '';
     my $dbh = Bugzilla->dbh;
-    trick_taint($id);
     my ($value) = $dbh->selectrow_array(
             "SELECT login_name 
                FROM profiles