app/models/camaleon_cms/site.rb in camaleon_cms-2.0.1 vs app/models/camaleon_cms/site.rb in camaleon_cms-2.0.2

- old
+ new

@@ -109,11 +109,11 @@ get_option("comment_status", "pending") end # security: user register form show captcha? def security_user_register_captcha_enabled? - get_option('security_captcha_user_register', true) == true + get_option('security_captcha_user_register', false) == true end # auto create default user roles def set_default_user_roles(post_type = nil) user_role = self.user_roles.where({slug: 'admin', term_group: -1}).first_or_create({name: 'Administrator', description: 'Default roles admin'}) @@ -190,9 +190,10 @@ else CamaleonCms::User.where(site_id: self.id) end end + # return all users including administrators def users_include_admins if PluginRoutes.system_info["users_share_sites"] CamaleonCms::User.where(site_id: -1) else CamaleonCms::User.where("site_id = ? or role = ?", self.id, 'admin')