# HG changeset patch
# User Waitaya Krongapiradee <wyte.sk133@gmail.com>
# Date 2014-12-31 12:32:24
# Node ID 08f39063736a03559ed4b4bca25928fe21cb4d56
# Parent  02dc29f20fd1eed8ac548e3be64f750b49a835d1

Prevented empty messages from being sent and fixed a typo

diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -31,20 +31,21 @@
     user = User.find(session[:user_id])
     @message = Message.new(params[:message])
     @message.sender = user
-    if !@message.save
-      render :action => 'list' and return
+    if @message.body == '' or !@message.save
+      flash[:notice] = 'An error occurred'
     else
       flash[:notice] = 'New message posted'
-      redirect_to :action => 'list'
     end
+    redirect_to :action => 'list'
   end
 
   def reply
     user = User.find(session[:user_id])
     @message = Message.new(params[:r_message])
     @message.sender = user
-    if !@message.save
-      render :action => 'show' and return
+    if @message.body == '' or !@message.save
+      flash[:notice] = 'An error occurred'
+      redirect_to :action => 'show', :id => @message.replying_message_id
     else
       flash[:notice] = 'Message replied'
       rep_msg = @message.replying_message
@@ -58,7 +59,7 @@
     message = Message.find(params[:id])
     message.replied = true
     message.save
-    flash[:notice] = 'Message hided (just marked replied)'
+    flash[:notice] = 'Message hidden (just marked replied)'
     redirect_to :action => 'console'
   end