Download as
Browse Code »

Commit ae8adeac9d85ba5501dcbf3d53e5c9ca8cf134e0

Authored by Antonio Terceiro
1 parent 4f3ffcd8
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

ActionItem1210: only use environment if there is on already

Showing 1 changed file with 1 additions and 1 deletions   Show diff stats
app/models/profile.rb
  Diff comments   View file @ae8adea
@@ -569,7 +569,7 @@ private :generate_url, :url_options @@ -569,7 +569,7 @@ private :generate_url, :url_options
569 end 569 end
570 570
571 def theme 571 def theme
572 - self[:theme] || environment.theme 572 + self[:theme] || environment && environment.theme || 'default'
573 end 573 end
574 574
575 def public? 575 def public?