From 2b7c31feb50469ea8512ebf52e2b2c8f6239accb Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang
<% links = []
links << link_to(l(:label_register), :action => 'register') if Setting.self_registration?
- links << link_to(l(:label_password_lost), :action => 'password_lost') if Setting.password_lost?
+ links << link_to(l(:label_password_lost), :action => 'lost_password') if Setting.lost_password?
%>
<%= links.join(" | ") %>
-<%= check_box_tag 'settings[password_lost]', 1, Setting.password_lost? %><%= hidden_field_tag 'settings[password_lost]', 0 %>
+<%= check_box_tag 'settings[lost_password]', 1, Setting.lost_password? %><%= hidden_field_tag 'settings[lost_password]', 0 %><%= text_field_tag 'settings[attachment_max_size]', Setting.attachment_max_size, :size => 6 %> KB
diff --git a/config/settings.yml b/config/settings.yml index 252600b58..7ddbe5293 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -29,7 +29,7 @@ login_required: default: 0 self_registration: default: 1 -password_lost: +lost_password: default: 1 attachment_max_size: format: int