fix user find

LibreCat · Mar 26, 2018 · f461270 · f461270
1 parent fb7832b
commit f461270
Showing 1 changed file with 11 additions and 15 deletions.
diff --git a/lib/LibreCat/Model/User.pm b/lib/LibreCat/Model/User.pm
@@ -51,22 +51,18 @@ sub get {
 # TODO clean this up
 sub find {
     my ($self, $id) = @_;
-
-    $id // return;
-
-    my $hits = LibreCat->searcher->search('user', {cql => ["id=$id"]});
-    $hits = LibreCat->searcher->search('user', {cql => ["login=$id"]})
-        if !$hits->{total};
-    return $hits->{hits}->[0] if $hits->{total};
-
-    if (my $user
-        = $self->get($id)
-        || $self->find_by_username($id))
-    {
-        return $user;
+    if ($id) {
+        my $hits = LibreCat->searcher->search('user', {cql => ["id=$id"]});
+        $hits = LibreCat->searcher->search('user', {cql => ["login=$id"]})
+            if !$hits->{total};
+        return $hits->{hits}->[0] if $hits->{total};
+        if (my $user
+            = $self->get($id)
+            || $self->find_by_username($id))
+        {
+            return $user;
+        }
     }
-
-    return;
 }
 
 sub find_by_username {