Permalink
Browse files

Merge pull request #3649 from movilla/display_registration

Fix "if display_password_reset_link?" when diaspora.yml => enable_registrations: false
  • Loading branch information...
2 parents e6ec419 + 928a8a0 commit d979ac449957b39bc9fa390770d42dcb9563b0ab @jhass jhass committed Oct 10, 2012
Showing with 5 additions and 1 deletion.
  1. +4 −0 Changelog.md
  2. +1 −1 app/helpers/sessions_helper.rb
View
4 Changelog.md
@@ -1,5 +1,9 @@
# 0.0.2.0pre
+Fix error with open/close registrations.
+Fix javascripts error in invitations facebox.
+Fix css overflow problem in aspect dropdown on welcome page.
+
# 0.0.1.1
Fix syntax error in French Javascript pluralization rule.
View
2 app/helpers/sessions_helper.rb
@@ -9,7 +9,7 @@ def prefilled_username
end
def display_registration_link?
- !AppConfig.settings.enable_registrations? && devise_mapping.registerable? && controller_name != 'registrations'
+ AppConfig.settings.enable_registrations? && devise_mapping.registerable? && controller_name != 'registrations'
end
def display_password_reset_link?

0 comments on commit d979ac4

Please sign in to comment.