From 3e77241f8ae04de8e18d1668698748830f39bf39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Geuken?= <bgeuken@suse.de>
Date: Tue, 19 May 2015 19:54:10 +0200
Subject: [PATCH] user_registered: Return false if user is nil

The return value of user_registered? is only used as boolean. So we can
don't need to hande non existent users separately.
---
 app/models/conference.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/models/conference.rb b/app/models/conference.rb
index e7a0790c..7e7e48dc 100644
--- a/app/models/conference.rb
+++ b/app/models/conference.rb
@@ -119,11 +119,10 @@ class Conference < ActiveRecord::Base
   # ====Args
   # * +user+ -> The user we check for
   # ====Returns
-  # * +nil+ -> If the user doesn't exist
   # * +false+ -> If the user is registered
   # * +true+ - If the user isn't registered
   def user_registered? user
-    return nil if user.nil?
+    return false if user.nil?
 
     if registrations.where(user_id: user.id).count == 0
       return false