Merge branch 'master' of github.com:OWASP/railsgoat

app/models/user.rb

@@ -77,7 +77,11 @@ class User < ActiveRecord::Base
   def assign_user_id
     unless @skip_user_id_assign.present? || self.user_id.present?
       user = User.order("user_id").last
-      uid = user.user_id.to_i + 1 if user && user.user_id && !(User.exists?(:user_id => "#{user.user_id.to_i + 1}"))
+      uid = if user && user.user_id && !(User.exists?(:user_id => "#{user.user_id.to_i + 1}"))
+              user.user_id.to_i + 1
+            else
+              1
+            end
       self.user_id = uid.to_s if uid
     end
   end

app/views/layouts/shared/_footer.html.erb

@@ -1,6 +1,6 @@
 <footer>
   <p align="center">
-    &copy; The Open Web Application Security Project - OWASP, 2013
+    &copy; The Open Web Application Security Project - OWASP, 2015
   </p>
 </footer>