Merge remote branch 'core/user-profile-content-node' into development

cykod · Oct 29, 2010 · 891497d · 891497d
2 parents f5bda5b + ec7807f
commit 891497d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/vendor/modules/user_profile/app/controllers/user_profile/page_controller.rb b/vendor/modules/user_profile/app/controllers/user_profile/page_controller.rb
@@ -16,6 +16,8 @@ class DisplayProfileOptions < HashModel
 
     validates_presence_of :profile_type_id
 
+    canonical_paragraph "UserProfileType", :profile_type_id
+
     options_form(fld(:profile_type_id,:select,:options => :profile_type_select_options),
                  fld(:default_to_user,:yes_no))
 

diff --git a/vendor/modules/user_profile/app/models/user_profile_entry.rb b/vendor/modules/user_profile/app/models/user_profile_entry.rb
@@ -22,7 +22,7 @@ class UserProfileEntry < DomainModel
 
   cached_content  :identifier => :url
 
-  content_node(:container_type => 'UserProfileType', :container_field => 'user_profile_type_id', :push_value => true, :except => Proc.new() { |e| e.url.blank? })
+  content_node(:container_type => 'UserProfileType', :container_field => 'user_profile_type_id', :push_value => true, :except => Proc.new() { |e| e.url.blank? }, :published => :published)
 
   def self.find_published_profile(url,profile_type_id)
     self.find_by_url_and_user_profile_type_id(url,profile_type_id,:conditions => { :published => true })