From: Tom Hughes <tom@compton.nu>
Date: Wed, 29 Aug 2018 07:47:02 +0000 (+0100)
Subject: Avoid multiple returns
X-Git-Tag: live~2920
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/720da8b78ce22cb4049aecd2caafba38b7e778a9

Avoid multiple returns
---

diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index 6af860671..54850d403 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -26,13 +26,14 @@ class MessagesController < ApplicationController
 
     if current_user.sent_messages.where("sent_on >= ?", Time.now.getutc - 1.hour).count >= MAX_MESSAGES_PER_HOUR
       flash[:error] = t ".limit_exceeded"
+      render :action => "new"
     elsif @message.save
       flash[:notice] = t ".message_sent"
       Notifier.message_notification(@message).deliver_now
       redirect_to :action => :inbox
-      return
+    else
+      render :action => "new"
     end
-    render :action => "new"
   end
 
   # Allow the user to reply to another message.