fixed: error when clicking "add" with no block selected on my/page_layout

git-svn-id: http://redmine.rubyforge.org/svn/trunk@261 e93f8b46-1217-0410-a6f0-8f06a7374b81

2 files changed, 10 insertions, 4 deletions

diff --git a/app/controllers/my_controller.rb b/app/controllers/my_controller.rb
index f3d1b2a72..64a561f96 100644
--- a/app/controllers/my_controller.rb
+++ b/app/controllers/my_controller.rb
@@ -90,8 +90,9 @@ class MyController < ApplicationController
   # The block is added on top of the page
   # params[:block] : id of the block to add
   def add_block
-    @user = self.logged_in_user
     block = params[:block]
+    render(:nothing => true) and return unless block && (BLOCKS.keys.include? block)
+    @user = self.logged_in_user
     # remove if already present in a group
     %w(top left right).each {|f| (session[:page_layout][f] ||= []).delete block }
     # add it on top
diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 89a3c5c1c..c93a87c72 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -5,7 +5,12 @@ Copyright (C) 2006-2007  Jean-Philippe Lang
 http://redmine.rubyforge.org/

 

 

-== 02/18/2006 v0.4.2

+== xx/xx/2007 v0.4.3

+

+* fixed: error when clicking "add" with no block selected on my/page_layout

+

+

+== 02/18/2007 v0.4.2

 

 * Rails 1.2 is now required

 * settings are now stored in the database and editable through the application in: Admin -> Settings (config_custom.rb is no longer used)

@@ -33,12 +38,12 @@ http://redmine.rubyforge.org/
 * fixed: crash when a new user try to edit its "my page" layout

 

 

-== 01/03/2006 v0.4.1

+== 01/03/2007 v0.4.1

 

 * fixed: emails have no recipient when one of the project members has notifications disabled

 

 

-== 01/02/2006 v0.4.0

+== 01/02/2007 v0.4.0

 

 * simple SVN browser added (just needs svn binaries in PATH)

 * comments can now be added on news