app/views/moderator/posts/split.html.erb @@ -21,7 +21,7 @@ class UsersController < ApplicationController end def update - if !params[:user][:password].nil? && + if !params[:user][:password].blank? && params[:user][:password] == params[:user][:password_confirmation] params[:user][:crypted_password] = current_user.encrypt(params[:user][:password]) flash[:notice] = t(:password_has_been_changed) app/controllers/users_controller.rb @@ -1,13 +1,11 @@ module NamespacedHelper def selected(name) - if (params[:controller] == "admin/index" && name == "index") || - (params[:controller] == "admin/users" && name == "users" && params[:action] != "ban_ip") || - (params[:controller] == "admin/ranks" && name == "ranks") || - (params[:controller] == "admin/themes" && name == "themes") || - (params[:controller] == "admin/forums" && name == "forums") || - (params[:controller] == "admin/users" && name == "ip_banning" && params[:action] == "ban_ip") - (params[:controller] == "moderator/moderations" && name == "moderations") - 'selected' - end + 'selected' if (current_page?(:controller => "admin/index") && name == "index") || + (current_page?(:controller => "admin/users") && name == "users" && params[:action] != "ban_ip") || + (current_page?(:controller => "admin/ranks") && name == "ranks") || + (current_page?(:controller => "admin/themes") && name == "themes") || + (current_page?(:controller => "admin/forums") && name == "forums") || + (current_page(:controller => "admin/users") && name == "ip_banning" && params[:action] == "ban_ip") + (current_page(:controller => "moderator/moderations") && name == "moderations") end end app/helpers/namespaced_helper.rb @@ -257,7 +257,7 @@ :Position => "Position", :Post => "Post", :post_created => "Post has been created.", - :Post_excerpt => "Post excerpt:", + :Post_excerpt => "Post excerpt", :post_does_not_exist => "The post you were looking for could not be found.", :post_or_edit_not_found => "The post or edit you were looking for cannot be found.", :post_was_deleted => "Post was deleted.", config/locales/en.rb 9b4d4d791f3c10ba8fbfdc31c9d159f240be677b Ryan Bigg radarlistener@gmail.com http://github.com/radar/rboard/commit/31c7b12adb3f98cec2d4a801c8ac8d4f73e456ea 31c7b12adb3f98cec2d4a801c8ac8d4f73e456ea 2008-12-02T19:39:53-08:00 2008-12-02T19:39:53-08:00 Check if the password is blank, not if it's nil. Use current_page? for tab helpers 2146dc07d48e491bb831b1d1bd49fca1a3f93083 Ryan Bigg radarlistener@gmail.com