Merged r1442, r1443 and r1446 to r1449 from trunk.

git-svn-id: http://redmine.rubyforge.org/svn/branches/0.7-stable@1450 e93f8b46-1217-0410-a6f0-8f06a7374b81

app/views/users/_form.rhtml

@@ -13,7 +13,7 @@
 	<p><%= custom_field_tag_with_label @custom_value %></p>
 <% end if @custom_values%>
 
-<p><%= f.check_box :admin %></p>
+<p><%= f.check_box :admin, :disabled => (@user == User.current) %></p>
 </div>
 
 <div class="box">