Skip to content

Commit

Permalink
Merge pull request #1755 from scottsds/issue_3505_fix
Browse files Browse the repository at this point in the history
3505 v3: Remove .now and hope for the best
  • Loading branch information
CristinaRO committed Jul 12, 2014
2 parents fa6d3ef + 6ff1ad7 commit 127dbd5
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion app/controllers/works_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -823,7 +823,7 @@ def load_pseuds
def load_work
@work = Work.find_by_id(params[:id])
if @work.nil?
flash.now[:error] = ts("Sorry, we couldn't find the work you were looking for.")
flash[:error] = ts("Sorry, we couldn't find the work you were looking for.")
redirect_to root_path and return
elsif @collection && !@work.collections.include?(@collection)
redirect_to @work and return
Expand Down

0 comments on commit 127dbd5

Please sign in to comment.