Skip to content

Commit

Permalink
Correct some comments and documentation regarding user emails
Browse files Browse the repository at this point in the history
  • Loading branch information
carols10cents committed Feb 28, 2012
1 parent c291d5e commit 94e7471
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
5 changes: 3 additions & 2 deletions app/controllers/users_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -236,8 +236,7 @@ def reset_password_new
end
end

# Submitted passwords are checked for length and confirmation. If the user
# does not have an email address they are required to provide one. Once the
# Submitted passwords are checked for length and confirmation. Once the
# password has been reset the user is redirected to /
def reset_password_create
user = nil
Expand All @@ -264,6 +263,8 @@ def reset_password_create
return
end

# TODO: This may be unreachable, since we don't allow password reset
# without an email... look into this and remove this code if so.
if user.email.nil?
if params[:email].empty?
flash[:notice] = "Email must be provided"
Expand Down
2 changes: 1 addition & 1 deletion app/models/author.rb
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ def avatar_url
if image_url.present?
image_url

# If the user has an email (Don't they have to?), look for a gravatar url.
# If the user has an email, look for a gravatar url.
elsif email.present?
gravatar_url

Expand Down
2 changes: 1 addition & 1 deletion docs/app_index.html
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@
<div class="pilwrap">
<a class="pilcrow" href="#section-models-authorization">&#182;</a>
</div>
<p>An Authorization is an ability of a User to log in to rstat.us. Currently, the only ways an Authorization is created are if a User logs in to rstat.us with Twitter or a User associates their Twitter account with their existing rstat.us email account.</p>
<p>An Authorization is an ability of a User to log in to rstat.us. Currently, the only ways an Authorization is created are if a User logs in to rstat.us with Twitter or a User associates their Twitter account with their existing rstat.us username account.</p>
</td>
<td class=code>
<div class='highlight'><pre>|- <a class="source" href="app/models/authorization.html">authorization.rb</a></pre></div>
Expand Down

0 comments on commit 94e7471

Please sign in to comment.