Merge pull request #559 from ZogStriP/fix-exception-when-wrong-resource-type-in-url

[fixes #391] exception when wrong resource type in URL
This commit is contained in:
Sam 2013-03-24 16:16:34 -07:00
commit b1d1ab7d2b

View file

@ -93,7 +93,7 @@ class ApplicationController < ActionController::Base
# 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