Skip to content

Commit

Permalink
Merge pull request discourse#559 from ZogStriP/fix-exception-when-wro…
Browse files Browse the repository at this point in the history
…ng-resource-type-in-url

[fixes #391] exception when wrong resource type in URL
  • Loading branch information
SamSaffron committed Mar 24, 2013
2 parents ff3028d + 0da8f35 commit b1d1ab7
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion app/controllers/application_controller.rb
Expand Up @@ -93,7 +93,7 @@ def store_preloaded(key, json)

# If we are rendering HTML, preload the session data
def preload_json
if request.format.html?
if request.format && request.format.html?
if guardian.current_user
guardian.current_user.sync_notification_channel_position
end
Expand Down

0 comments on commit b1d1ab7

Please sign in to comment.