From 4922e8b20fb3f91e36278defa02563eb1ceaf4d9 Mon Sep 17 00:00:00 2001
From: Mason James <mtj@kohaaloha.com>
Date: Fri, 23 Jan 2015 20:13:57 +1300
Subject: [PATCH] Revert "Bug 13502: Code introcduced in 1861 wrongly assumes a
 null userid is unique"

This reverts commit 8552175a50e4e0d9b2cbcdc18055c16a6fbebae2.
---
 C4/Members.pm | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/C4/Members.pm b/C4/Members.pm
index c15dbb4e4b..f6cf4a75bd 100644
--- a/C4/Members.pm
+++ b/C4/Members.pm
@@ -863,21 +863,19 @@ sub AddMember {
 =cut
 
 sub Check_Userid {
-    my ( $uid, $borrowernumber ) = @_;
-
-    return 0 unless ($uid); # userid is a unique column, we should assume NULL is not unique
-
-    return 0 if ( $uid eq C4::Context->config('user') );
-
-    my $rs = Koha::Database->new()->schema()->resultset('Borrower');
-
-    my $params;
-    $params->{userid} = $uid;
-    $params->{borrowernumber} = { '!=' => $borrowernumber } if ($borrowernumber);
-
-    my $count = $rs->count( $params );
-
-    return $count ? 0 : 1;
+    my ($uid,$member) = @_;
+    my $dbh = C4::Context->dbh;
+    my $sth =
+      $dbh->prepare(
+        "SELECT * FROM borrowers WHERE userid=? AND borrowernumber != ?");
+    $sth->execute( $uid, $member );
+    if ( (( $uid ne '' ) && ( my $row = $sth->fetchrow_hashref    )) or
+         (( $uid ne '' ) && ( $uid eq C4::Context->config('user') )) ) {
+        return 0;
+    }
+    else {
+        return 1;
+    }
 }
 
 =head2 Generate_Userid
-- 
2.39.5