Issue #6117: Fix contact form permissions for admin role on settings …

…form.

By @kiamlaluno, @olafgrabienski, @indigoxela, and @bugfolder.

core/modules/contact/contact.admin.inc

@@ -141,9 +141,8 @@ function contact_form_permissions() {
       '#description' => theme('user_permission_description', array('permission_item' => $perm_item)),
     );
     foreach ($roles as $role_name => $role) {
-      // Builds arrays for checked boxes for each role. Always select the Admin
-      // role on new forms.
-      if (in_array($perm, $role->permissions) || ($role->name == $admin_role)) {
+      // Builds arrays for checked boxes for each role.
+      if (in_array($perm, $role->permissions)) {
         $status[$role_name][] = $perm;
       }
     }